You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by ch...@apache.org on 2022/10/19 03:08:12 UTC
[dolphinscheduler] branch dev updated: [Improvement][Style] Fix remaining style errors and wildcard imports (#12412)
This is an automated email from the ASF dual-hosted git repository.
chufenggao pushed a commit to branch dev
in repository https://gitbox.apache.org/repos/asf/dolphinscheduler.git
The following commit(s) were added to refs/heads/dev by this push:
new d46e4659d9 [Improvement][Style] Fix remaining style errors and wildcard imports (#12412)
d46e4659d9 is described below
commit d46e4659d917e1994bc9045c57fe3b865a308352
Author: Eric Gao <er...@gmail.com>
AuthorDate: Wed Oct 19 11:08:04 2022 +0800
[Improvement][Style] Fix remaining style errors and wildcard imports (#12412)
* Fix remaining style errors and wildcard imports
* Upgrade spotless to the latest stable version, exclude .github folder from spotless check and fix dead link
* Fix spotless matching scope of markdown files
---
docs/docs/en/about/glossary.md | 2 +-
docs/docs/en/about/hardware.md | 3 +-
docs/docs/en/contribute/join/become-a-committer.md | 3 +-
docs/docs/en/guide/datasource/oracle.md | 24 +-
docs/docs/en/guide/installation/standalone.md | 4 +-
docs/docs/en/guide/upgrade/incompatible.md | 1 +
docs/docs/zh/about/hardware.md | 3 +-
docs/docs/zh/contribute/join/become-a-committer.md | 1 +
docs/docs/zh/guide/datasource/oracle.md | 1 +
docs/docs/zh/guide/parameter/built-in.md | 61 +--
docs/docs/zh/guide/upgrade/incompatible.md | 1 +
.../dolphinscheduler-alert-api/pom.xml | 11 +-
.../dolphinscheduler/alert/api/AlertChannel.java | 1 +
.../alert/api/AlertChannelFactory.java | 3 +-
.../dolphinscheduler/alert/api/AlertConstants.java | 1 +
.../dolphinscheduler/alert/api/ShowType.java | 1 +
.../dolphinscheduler-alert-dingtalk/pom.xml | 7 +-
.../dingtalk/DingTalkAlertChannelFactory.java | 19 +-
.../alert/dingtalk/DingTalkParamsConstants.java | 1 +
.../plugin/alert/dingtalk/DingTalkSender.java | 17 +-
.../dolphinscheduler-alert-email/pom.xml | 7 +-
.../plugin/alert/email/EmailAlertChannel.java | 1 +
.../alert/email/EmailAlertChannelFactory.java | 142 +++---
.../plugin/alert/email/EmailConstants.java | 28 +-
.../plugin/alert/email/ExcelUtils.java | 18 +-
.../plugin/alert/email/MailParamsConstants.java | 1 +
.../plugin/alert/email/MailSender.java | 20 +-
.../alert/email/exception/AlertEmailException.java | 1 +
.../alert/email/template/DefaultHTMLTemplate.java | 10 +-
.../dolphinscheduler-alert-feishu/pom.xml | 7 +-
.../plugin/alert/feishu/FeiShuAlertChannel.java | 1 +
.../alert/feishu/FeiShuAlertChannelFactory.java | 62 +--
.../plugin/alert/feishu/FeiShuParamsConstants.java | 1 +
.../plugin/alert/feishu/FeiShuSender.java | 14 +-
.../plugin/alert/feishu/HttpRequestUtil.java | 4 +-
.../dolphinscheduler-alert-http/pom.xml | 7 +-
.../plugin/alert/http/HttpAlertChannel.java | 1 +
.../plugin/alert/http/HttpAlertChannelFactory.java | 63 +--
.../plugin/alert/http/HttpAlertConstants.java | 1 +
.../dolphinscheduler-alert-pagerduty/pom.xml | 7 +-
.../alert/pagerduty/PagerDutyAlertChannel.java | 1 +
.../pagerduty/PagerDutyAlertChannelFactory.java | 9 +-
.../alert/pagerduty/PagerDutyParamsConstants.java | 1 +
.../plugin/alert/pagerduty/PagerDutySender.java | 20 +-
.../dolphinscheduler-alert-script/pom.xml | 7 +-
.../plugin/alert/script/OSUtils.java | 1 +
.../plugin/alert/script/ProcessUtils.java | 1 +
.../plugin/alert/script/ScriptAlertChannel.java | 1 +
.../alert/script/ScriptAlertChannelFactory.java | 41 +-
.../plugin/alert/script/ScriptParamsConstants.java | 1 +
.../plugin/alert/script/ScriptType.java | 1 +
.../plugin/alert/script/StreamGobbler.java | 1 +
.../dolphinscheduler-alert-slack/pom.xml | 7 +-
.../plugin/alert/slack/SlackAlertChannel.java | 1 +
.../alert/slack/SlackAlertChannelFactory.java | 24 +-
.../plugin/alert/slack/SlackParamsConstants.java | 1 +
.../plugin/alert/slack/SlackSender.java | 16 +-
.../dolphinscheduler-alert-telegram/pom.xml | 7 +-
.../alert/telegram/TelegramAlertChannel.java | 1 +
.../telegram/TelegramAlertChannelFactory.java | 74 +--
.../alert/telegram/TelegramParamsConstants.java | 1 -
.../plugin/alert/telegram/TelegramSender.java | 14 +-
.../dolphinscheduler-alert-webexteams/pom.xml | 7 +-
.../plugin/alert/webexteams/WebexMessage.java | 1 +
.../alert/webexteams/WebexTeamsAlertChannel.java | 1 +
.../webexteams/WebexTeamsAlertChannelFactory.java | 90 ++--
.../alert/webexteams/WebexTeamsDestination.java | 4 +-
.../plugin/alert/webexteams/WebexTeamsSender.java | 9 +-
.../dolphinscheduler-alert-wechat/pom.xml | 7 +-
.../plugin/alert/wechat/WeChatAlertChannel.java | 1 +
.../alert/wechat/WeChatAlertChannelFactory.java | 74 +--
.../plugin/alert/wechat/WeChatAlertConstants.java | 4 +-
.../alert/wechat/WeChatAlertParamsConstants.java | 1 +
.../plugin/alert/wechat/WeChatSender.java | 28 +-
.../plugin/alert/wechat/WeChatType.java | 2 +-
.../plugin/alert/wechat/WechatAppChatMessage.java | 4 +-
.../plugin/alert/wechat/WechatAppMessage.java | 3 +-
.../dolphinscheduler-alert-plugins/pom.xml | 7 +-
.../dolphinscheduler/alert/AlertPluginManager.java | 32 +-
.../alert/AlertRequestProcessor.java | 14 +-
.../dolphinscheduler/alert/AlertServerMetrics.java | 2 +-
dolphinscheduler-alert/pom.xml | 10 +-
.../dolphinscheduler/api/ApiApplicationServer.java | 1 -
.../api/aspect/AccessLogAnnotation.java | 1 +
.../api/aspect/AccessLogAspect.java | 16 +-
.../dolphinscheduler/api/audit/AuditMessage.java | 4 +-
.../api/configuration/AuditConfiguration.java | 3 +-
.../OpenAPITranslationConfiguration.java | 44 +-
.../configuration/PythonGatewayConfiguration.java | 1 +
.../api/configuration/TaskTypeConfiguration.java | 12 +-
.../api/configuration/TrafficConfiguration.java | 4 +-
.../constants/ApiFuncIdentificationConstant.java | 23 +-
.../api/controller/AccessTokenController.java | 2 +-
.../api/controller/AlertGroupController.java | 2 +-
.../controller/AlertPluginInstanceController.java | 1 +
.../api/controller/ClusterController.java | 2 +-
.../api/controller/DataQualityController.java | 2 +-
.../api/controller/DataSourceController.java | 2 +-
.../api/controller/DsErrorController.java | 2 +
.../api/controller/EnvironmentController.java | 2 +-
.../api/controller/ExecutorController.java | 26 +-
.../api/controller/FavTaskController.java | 22 +-
.../api/controller/K8sNamespaceController.java | 2 +-
.../api/controller/MonitorController.java | 3 +-
.../controller/ProcessDefinitionController.java | 12 +-
.../api/controller/ProcessInstanceController.java | 42 +-
.../api/controller/ProjectController.java | 2 +-
.../api/controller/ProjectV2Controller.java | 2 +-
.../api/controller/QueueController.java | 2 +-
.../api/controller/QueueV2Controller.java | 24 +-
.../api/controller/ResourcesController.java | 2 +-
.../api/controller/SchedulerController.java | 1 +
.../api/controller/TaskDefinitionController.java | 2 +-
.../api/controller/TaskInstanceController.java | 2 +-
.../api/controller/TenantController.java | 2 +-
.../api/controller/UsersController.java | 2 +-
.../api/controller/WorkFlowLineageController.java | 2 +-
.../api/controller/WorkerGroupController.java | 20 +-
.../api/dto/CommandStateCount.java | 3 +-
.../api/dto/CreateTokenRequest.java | 2 +-
.../api/dto/CreateTokenResponse.java | 1 +
.../dolphinscheduler/api/dto/RuleDefinition.java | 2 +-
.../dolphinscheduler/api/dto/TaskCountDto.java | 8 +-
.../dolphinscheduler/api/dto/TaskStateCount.java | 3 +-
.../dolphinscheduler/api/dto/gantt/GanttDto.java | 9 +-
.../dolphinscheduler/api/dto/gantt/Task.java | 1 +
.../api/dto/project/ProjectCreateRequest.java | 2 +-
.../api/dto/project/ProjectDeleteResponse.java | 2 +-
.../api/dto/project/ProjectQueryRequest.java | 3 +-
.../api/dto/project/ProjectUpdateRequest.java | 4 +-
.../api/dto/queue/QueueCreateRequest.java | 2 +-
.../api/dto/queue/QueueQueryRequest.java | 3 +-
.../api/dto/queue/QueueUpdateRequest.java | 3 +-
.../api/dto/queue/QueueVerifyRequest.java | 2 +-
.../api/dto/resources/FileLeaf.java | 2 +-
.../api/dto/resources/filter/IFilter.java | 1 +
.../api/dto/resources/filter/ResourceFilter.java | 17 +-
.../dto/resources/visitor/ResourceTreeVisitor.java | 27 +-
.../api/dto/resources/visitor/Visitor.java | 1 +
.../api/dto/schedule/ScheduleCreateRequest.java | 3 -
.../dolphinscheduler/api/enums/ExecuteType.java | 2 +-
.../api/exceptions/ApiException.java | 1 +
.../api/exceptions/ApiExceptionHandler.java | 1 -
.../api/interceptor/RateLimitInterceptor.java | 16 +-
.../dolphinscheduler/api/k8s/K8sClientService.java | 35 +-
.../dolphinscheduler/api/k8s/K8sManager.java | 4 +-
.../api/permission/PermissionCheck.java | 10 +-
.../permission/ResourcePermissionCheckService.java | 11 +-
.../ResourcePermissionCheckServiceImpl.java | 46 +-
.../dolphinscheduler/api/python/PythonGateway.java | 144 +++---
.../api/security/Authenticator.java | 1 +
.../api/security/SecurityConfig.java | 1 +
.../api/security/impl/AbstractAuthenticator.java | 3 +-
.../api/security/impl/ldap/LdapAuthenticator.java | 2 +-
.../api/service/AccessTokenService.java | 1 -
.../api/service/AlertGroupService.java | 3 +-
.../api/service/AlertPluginInstanceService.java | 5 +-
.../dolphinscheduler/api/service/BaseService.java | 9 +-
.../api/service/ClusterService.java | 1 -
.../api/service/DataAnalysisService.java | 4 +-
.../api/service/DataSourceService.java | 2 +-
.../api/service/DqRuleService.java | 2 +-
.../api/service/EnvironmentService.java | 5 +-
.../EnvironmentWorkerGroupRelationService.java | 1 -
.../api/service/ExecutorService.java | 3 +-
.../api/service/K8sNamespaceService.java | 8 +-
.../api/service/LoggerService.java | 1 -
.../api/service/MonitorService.java | 12 +-
.../api/service/ProcessDefinitionService.java | 4 +-
.../api/service/ProcessInstanceService.java | 10 +-
.../dolphinscheduler/api/service/QueueService.java | 2 -
.../api/service/ResourcesService.java | 17 +-
.../api/service/TaskGroupQueueService.java | 8 +-
.../api/service/TaskGroupService.java | 2 +-
.../api/service/TenantService.java | 2 +-
.../api/service/UdfFuncService.java | 22 +-
.../dolphinscheduler/api/service/UsersService.java | 10 +-
.../api/service/WorkerGroupService.java | 3 +-
.../api/service/impl/AccessTokenServiceImpl.java | 7 +-
.../api/service/impl/AlertGroupServiceImpl.java | 44 +-
.../impl/AlertPluginInstanceServiceImpl.java | 46 +-
.../api/service/impl/AuditServiceImpl.java | 2 +-
.../api/service/impl/BaseServiceImpl.java | 55 ++-
.../api/service/impl/ClusterServiceImpl.java | 4 +-
.../api/service/impl/DataAnalysisServiceImpl.java | 16 +-
.../api/service/impl/DataSourceServiceImpl.java | 77 ++--
.../service/impl/DqExecuteResultServiceImpl.java | 1 -
.../api/service/impl/EnvironmentServiceImpl.java | 45 +-
.../EnvironmentWorkerGroupRelationServiceImpl.java | 12 +-
.../api/service/impl/FavTaskServiceImpl.java | 6 +-
.../api/service/impl/K8SNamespaceServiceImpl.java | 4 +-
.../api/service/impl/LoggerServiceImpl.java | 17 +-
.../api/service/impl/MonitorServiceImpl.java | 50 +-
.../service/impl/ProcessDefinitionServiceImpl.java | 6 +-
.../service/impl/ProcessInstanceServiceImpl.java | 144 +++---
.../api/service/impl/ProjectServiceImpl.java | 34 +-
.../api/service/impl/QueueServiceImpl.java | 29 +-
.../api/service/impl/ResourcesServiceImpl.java | 70 ++-
.../api/service/impl/SessionServiceImpl.java | 2 +-
.../service/impl/TaskGroupQueueServiceImpl.java | 21 +-
.../api/service/impl/TaskGroupServiceImpl.java | 3 +-
.../api/service/impl/TaskInstanceServiceImpl.java | 45 +-
.../api/service/impl/TenantServiceImpl.java | 64 +--
.../api/service/impl/UdfFuncServiceImpl.java | 76 +--
.../api/service/impl/UsersServiceImpl.java | 22 +-
.../service/impl/WorkFlowLineageServiceImpl.java | 60 ++-
.../api/service/impl/WorkerGroupServiceImpl.java | 3 +-
.../dolphinscheduler/api/utils/CheckUtils.java | 8 +-
.../dolphinscheduler/api/utils/FileUtils.java | 1 +
.../dolphinscheduler/api/utils/PageInfo.java | 4 +-
.../api/controller/WorkerGroupControllerTest.java | 4 +-
.../api/service/BaseServiceTest.java | 1 +
.../api/service/ProcessInstanceServiceTest.java | 23 +-
.../service/ProcessTaskRelationServiceTest.java | 1 +
.../api/service/TenantServiceTest.java | 3 +-
.../api/service/WorkerGroupServiceTest.java | 8 +-
.../common/config/YamlPropertySourceFactory.java | 6 +-
.../dolphinscheduler/common/enums/AlertEvent.java | 2 +-
.../dolphinscheduler/common/enums/AlertStatus.java | 1 +
.../dolphinscheduler/common/enums/AlertType.java | 4 +-
.../common/enums/AlertWarnLevel.java | 2 +-
.../common/enums/AuditResourceType.java | 1 +
.../common/enums/AuthorizationType.java | 17 +-
.../common/enums/BlockingOpportunity.java | 2 +-
.../dolphinscheduler/common/enums/CacheType.java | 1 +
.../dolphinscheduler/common/enums/CommandType.java | 2 +-
.../common/enums/ComplementDependentMode.java | 5 +-
.../common/enums/ConditionType.java | 1 +
.../apache/dolphinscheduler/common/enums/Flag.java | 1 +
.../common/enums/HttpCheckCondition.java | 4 +-
.../dolphinscheduler/common/enums/HttpMethod.java | 2 +-
.../common/enums/HttpParametersType.java | 2 +-
.../dolphinscheduler/common/enums/PluginType.java | 3 +-
.../dolphinscheduler/common/enums/Priority.java | 1 +
.../common/enums/ReleaseState.java | 4 +-
.../dolphinscheduler/common/enums/RunMode.java | 3 +-
.../common/enums/SlotCheckState.java | 2 +-
.../common/enums/SqoopJobType.java | 3 +-
.../common/enums/TaskDependType.java | 1 +
.../common/enums/TaskExecuteType.java | 1 +
.../common/enums/TaskRecordStatus.java | 3 +-
.../dolphinscheduler/common/enums/TimeoutFlag.java | 1 +
.../dolphinscheduler/common/enums/UdfType.java | 14 +-
.../dolphinscheduler/common/enums/UserType.java | 2 +-
.../dolphinscheduler/common/enums/WarningType.java | 3 +-
.../common/enums/WorkflowExecutionStatus.java | 8 +-
.../StorageOperateNoConfiguredException.java | 3 +-
.../apache/dolphinscheduler/common/graph/DAG.java | 19 +-
.../common/model/BaseHeartBeatTask.java | 6 +-
.../common/model/MasterHeartBeat.java | 1 +
.../common/model/PreviousTaskNode.java | 2 +-
.../dolphinscheduler/common/model/Server.java | 4 +-
.../common/model/TaskNodeRelation.java | 2 +-
.../common/model/WorkerHeartBeat.java | 1 -
.../common/process/HttpProperty.java | 9 +-
.../common/shell/AbstractShell.java | 28 +-
.../common/shell/ShellExecutor.java | 12 +-
.../common/thread/ThreadUtils.java | 4 +-
.../common/utils/CollectionUtils.java | 3 +-
.../dolphinscheduler/common/utils/DateUtils.java | 19 +-
.../dolphinscheduler/common/utils/FileUtils.java | 12 +-
.../dolphinscheduler/common/utils/HttpUtils.java | 18 +-
.../common/utils/KerberosHttpClient.java | 15 +-
.../common/utils/RetryerUtils.java | 4 +-
.../utils/placeholder/BusinessTimeUtils.java | 4 +-
.../dolphinscheduler/common/ConstantsTest.java | 1 +
.../common/exception/ExceptionTest.java | 3 +-
.../dolphinscheduler/common/graph/DAGTest.java | 511 ++++++++++-----------
.../dolphinscheduler/common/os/OSUtilsTest.java | 8 +-
.../common/utils/CodeGenerateUtilsTest.java | 5 +-
.../common/utils/DateUtilsTest.java | 17 +-
.../common/utils/EncryptionUtilsTest.java | 1 -
.../common/utils/FileUtilsTest.java | 11 +-
.../common/utils/LocalJettyHttpServer.java | 21 +-
.../common/utils/LocalServerHttpUtilsTest.java | 16 +-
.../common/utils/NetUtilsTest.java | 3 +-
.../common/utils/PropertyUtilsTest.java | 1 +
.../common/utils/RetryerUtilsTest.java | 7 +-
.../common/utils/ScriptRunnerTest.java | 7 +-
.../dolphinscheduler/common/utils/StringTest.java | 12 +-
.../org/apache/dolphinscheduler/dao/AlertDao.java | 4 +-
.../dao/entity/CycleDependency.java | 1 +
.../dolphinscheduler/dao/entity/DagData.java | 3 +-
.../dolphinscheduler/dao/entity/DataSource.java | 2 +-
.../dao/entity/DependentProcessDefinition.java | 6 +-
.../dao/entity/DqExecuteResultAlertContent.java | 5 +-
.../dolphinscheduler/dao/entity/ErrorCommand.java | 2 +-
.../dao/entity/ExecuteStatusCount.java | 3 +-
.../dolphinscheduler/dao/entity/FavTask.java | 7 +-
.../dao/entity/ProcessAlertContent.java | 20 +-
.../dao/entity/ResponseTaskLog.java | 1 +
.../dao/entity/ServerAlertContent.java | 1 +
.../dolphinscheduler/dao/entity/Session.java | 6 +-
.../dao/entity/TaskAlertContent.java | 9 +-
.../dao/entity/WorkFlowLineage.java | 1 +
.../dao/entity/WorkFlowRelation.java | 3 +-
.../dao/entity/ZookeeperRecord.java | 6 +-
.../dao/mapper/AccessTokenMapper.java | 7 +-
.../dao/mapper/AlertGroupMapper.java | 10 +-
.../dao/mapper/AuditLogMapper.java | 1 +
.../dolphinscheduler/dao/mapper/CommandMapper.java | 11 +-
.../dao/mapper/DataSourceMapper.java | 15 +-
.../dao/mapper/DataSourceUserMapper.java | 1 -
.../dao/mapper/EnvironmentMapper.java | 6 +-
.../dao/mapper/ErrorCommandMapper.java | 6 +-
.../dolphinscheduler/dao/mapper/FavTaskMapper.java | 4 +-
.../dao/mapper/K8sNamespaceMapper.java | 167 +++----
.../dao/mapper/ProcessDefinitionLogMapper.java | 7 +-
.../dao/mapper/ProcessInstanceMapMapper.java | 4 +-
.../dolphinscheduler/dao/mapper/ProjectMapper.java | 4 +-
.../dolphinscheduler/dao/mapper/QueueMapper.java | 10 +-
.../dao/mapper/ResourceMapper.java | 12 +-
.../dao/mapper/ResourceUserMapper.java | 2 +-
.../dolphinscheduler/dao/mapper/SessionMapper.java | 6 +-
.../dao/mapper/TaskDefinitionLogMapper.java | 3 +-
.../dao/mapper/TaskGroupMapper.java | 9 +-
.../dao/mapper/TaskGroupQueueMapper.java | 19 +-
.../dao/mapper/TaskInstanceMapper.java | 31 +-
.../dolphinscheduler/dao/mapper/TenantMapper.java | 12 +-
.../dolphinscheduler/dao/mapper/UDFUserMapper.java | 5 +-
.../dolphinscheduler/dao/mapper/UdfFuncMapper.java | 10 +-
.../dolphinscheduler/dao/mapper/UserMapper.java | 1 -
.../dao/mapper/WorkFlowLineageMapper.java | 7 +-
.../dolphinscheduler/dao/upgrade/JsonSplitDao.java | 45 +-
.../dao/upgrade/ProcessDefinitionDao.java | 7 +-
.../dolphinscheduler/dao/upgrade/ScheduleDao.java | 3 +-
.../dolphinscheduler/dao/upgrade/SchemaUtils.java | 7 +-
.../dao/upgrade/WorkerGroupDao.java | 16 +-
.../dolphinscheduler/dao/utils/BeanContext.java | 4 +-
.../dao/utils/PostgreSQLPerformance.java | 4 +-
.../dao/utils/ResourceProcessDefinitionUtils.java | 4 +-
.../dao/utils/TaskInstanceUtils.java | 3 +-
.../dolphinscheduler/dao/utils/WorkflowUtils.java | 12 +-
.../apache/dolphinscheduler/dao/AlertDaoTest.java | 11 +-
.../dao/entity/ProcessDefinitionTest.java | 8 +-
.../dao/entity/TaskInstanceTest.java | 8 +-
.../dao/mapper/AccessTokenMapperTest.java | 9 +-
.../dao/mapper/AlertGroupMapperTest.java | 13 +-
.../dao/mapper/AlertSendStatusMapperTest.java | 1 +
.../dao/mapper/AuditLogMapperTest.java | 2 +-
.../dao/mapper/CommandMapperTest.java | 1 -
.../dao/mapper/DataSourceUserMapperTest.java | 10 +-
.../dao/mapper/DqRuleInputEntryMapperTest.java | 9 +-
.../EnvironmentWorkerGroupRelationMapperTest.java | 10 +-
.../dao/mapper/ErrorCommandMapperTest.java | 12 +-
.../dao/mapper/PluginDefineTest.java | 3 +-
.../dao/mapper/ProcessInstanceMapMapperTest.java | 17 +-
.../dao/mapper/ProcessInstanceMapperTest.java | 15 +-
.../mapper/ProcessTaskRelationLogMapperTest.java | 2 +-
.../dao/mapper/ProcessTaskRelationMapperTest.java | 2 +-
.../dao/mapper/ProjectMapperTest.java | 27 +-
.../dao/mapper/ProjectUserMapperTest.java | 13 +-
.../dao/mapper/QueueMapperTest.java | 14 +-
.../dao/mapper/ResourceUserMapperTest.java | 23 +-
.../dao/mapper/SessionMapperTest.java | 14 +-
.../dao/mapper/TaskDefinitionMapperTest.java | 2 +-
.../dao/mapper/TaskGroupMapperTest.java | 1 -
.../dao/mapper/TaskInstanceMapperTest.java | 4 +-
.../dao/mapper/TenantMapperTest.java | 22 +-
.../dao/mapper/UDFUserMapperTest.java | 45 +-
.../dao/mapper/UserMapperTest.java | 48 +-
.../dao/mapper/WorkFlowLineageMapperTest.java | 20 +-
.../dao/mapper/WorkerGroupMapperTest.java | 11 +-
.../dao/upgrade/ProcessDefinitionDaoTest.java | 18 +-
.../dao/upgrade/SchemaUtilsTest.java | 2 +-
.../dao/upgrade/WorkerGroupDaoTest.java | 9 +-
.../utils/ResourceProcessDefinitionUtilsTest.java | 19 +-
.../dao/utils/TaskInstanceUtilsTest.java | 2 +-
.../dao/utils/WorkflowUtilsTest.java | 6 +-
.../data/quality/DataQualityApplication.java | 10 +-
.../data/quality/config/BaseConfig.java | 4 +-
.../data/quality/config/Config.java | 8 +-
.../quality/config/DataQualityConfiguration.java | 5 +-
.../data/quality/config/EnvConfig.java | 4 +-
.../data/quality/config/ReaderConfig.java | 5 +-
.../data/quality/config/TransformerConfig.java | 5 +-
.../data/quality/config/WriterConfig.java | 5 +-
.../data/quality/context/DataQualityContext.java | 8 +-
.../data/quality/enums/ReaderType.java | 3 +-
.../data/quality/enums/TransformerType.java | 3 +-
.../data/quality/enums/WriterType.java | 3 +-
.../data/quality/execution/Execution.java | 1 +
.../quality/execution/SparkBatchExecution.java | 12 +-
.../quality/execution/SparkRuntimeEnvironment.java | 4 +-
.../data/quality/flow/Component.java | 4 +-
.../data/quality/flow/batch/reader/HiveReader.java | 2 +-
.../data/quality/flow/batch/reader/JdbcReader.java | 4 +-
.../quality/flow/batch/reader/ReaderFactory.java | 4 +-
.../flow/batch/transformer/TransformerFactory.java | 6 +-
.../data/quality/flow/batch/writer/JdbcWriter.java | 18 +-
.../quality/flow/batch/writer/WriterFactory.java | 6 +-
.../flow/batch/writer/file/BaseFileWriter.java | 13 +-
.../flow/batch/writer/file/HdfsFileWriter.java | 2 +-
.../flow/batch/writer/file/LocalFileWriter.java | 2 +-
.../data/quality/utils/JsonUtils.java | 4 +-
.../dolphinscheduler-datasource-all/pom.xml | 7 +-
.../api/client/CommonDataSourceClient.java | 5 +-
.../api/datasource/BaseHDFSConnectionParam.java | 1 +
.../api/datasource/DataSourceProcessor.java | 1 -
.../api/plugin/DataSourcePluginManager.java | 11 +-
.../api/plugin/DataSourceProcessorManager.java | 1 +
.../api/plugin/DataSourceProcessorProvider.java | 6 +-
.../plugin/datasource/api/utils/CommonUtils.java | 10 +-
.../datasource/api/utils/DataSourceUtils.java | 11 +-
.../api/datasource/MySQLConnectionParam.java | 1 +
.../dolphinscheduler-datasource-athena/pom.xml | 10 +-
.../datasource/athena/AthenaDataSourceChannel.java | 3 +-
.../athena/AthenaDataSourceChannelFactory.java | 1 +
.../datasource/athena/AthenaDataSourceClient.java | 1 +
.../athena/param/AthenaDataSourceParamDTO.java | 1 +
.../athena/param/AthenaDataSourceProcessor.java | 20 +-
.../ClickHouseDataSourceChannelFactory.java | 1 +
.../param/ClickHouseConnectionParam.java | 1 +
.../param/ClickHouseDataSourceProcessor.java | 9 +-
.../datasource/db2/param/Db2ConnectionParam.java | 1 +
.../db2/param/Db2DataSourceProcessor.java | 3 +-
.../hive/HiveDataSourceChannelFactory.java | 1 +
.../datasource/hive/param/HiveConnectionParam.java | 1 +
.../hive/param/HiveDataSourceProcessor.java | 3 +-
.../mysql/MySQLDataSourceChannelFactory.java | 1 +
.../mysql/param/MySQLConnectionParam.java | 1 +
.../mysql/param/MySQLDataSourceProcessor.java | 18 +-
.../oracle/OracleDataSourceChannelFactory.java | 1 +
.../oracle/param/OracleConnectionParam.java | 1 +
.../PostgreSQLDataSourceChannelFactory.java | 1 +
.../param/PostgreSQLConnectionParam.java | 1 +
.../param/PostgreSQLDataSourceProcessor.java | 9 +-
.../presto/PrestoDataSourceChannelFactory.java | 1 +
.../presto/param/PrestoConnectionParam.java | 1 +
.../presto/param/PrestoDataSourceProcessor.java | 3 +-
.../dolphinscheduler-datasource-redshift/pom.xml | 9 +-
.../redshift/RedshiftDataSourceChannel.java | 3 +-
.../redshift/RedshiftDataSourceChannelFactory.java | 1 +
.../redshift/RedshiftDataSourceClient.java | 1 +
.../redshift/param/RedshiftConnectionParam.java | 1 +
.../param/RedshiftDataSourceProcessor.java | 15 +-
.../spark/SparkDataSourceChannelFactory.java | 1 +
.../spark/param/SparkConnectionParam.java | 1 +
.../spark/param/SparkDataSourceProcessor.java | 15 +-
.../SQLServerDataSourceChannelFactory.java | 1 +
.../sqlserver/param/SQLServerConnectionParam.java | 1 +
.../param/SQLServerDataSourceProcessor.java | 3 +-
.../server/master/MasterServer.java | 5 +-
.../builder/TaskExecutionContextBuilder.java | 5 +-
.../cache/ProcessInstanceExecCacheManager.java | 3 +-
.../cache/StreamTaskInstanceExecCacheManager.java | 3 +-
.../impl/ProcessInstanceExecCacheManagerImpl.java | 6 +-
.../StreamTaskInstanceExecCacheManagerImpl.java | 11 +-
.../server/master/config/MasterConfig.java | 12 +-
.../master/consumer/TaskPriorityQueueConsumer.java | 15 +-
.../controller/WorkflowExecuteController.java | 3 +-
.../server/master/dispatch/ExecutorDispatcher.java | 2 +-
.../dispatch/executor/NettyExecutorManager.java | 2 -
.../master/dispatch/host/CommonHostManager.java | 5 +-
.../dispatch/host/LowerWeightHostManager.java | 13 +-
.../dispatch/host/assign/AbstractSelector.java | 5 +-
.../master/dispatch/host/assign/HostWeight.java | 15 +-
.../host/assign/LowerWeightRoundRobin.java | 12 +-
.../dispatch/host/assign/RoundRobinSelector.java | 4 +-
.../server/master/event/StateEvent.java | 6 +-
.../server/master/event/StateEventHandler.java | 4 +-
.../master/event/StateEventHandlerManager.java | 4 +-
.../master/event/TaskRetryStateEventHandler.java | 6 +-
.../master/event/TaskRunningEventHandler.java | 5 +-
.../server/master/event/TaskStateEvent.java | 7 +-
.../master/event/TaskTimeoutStateEventHandler.java | 26 +-
.../event/TaskWaitTaskGroupStateHandler.java | 3 +-
.../event/WorkflowBlockStateEventHandler.java | 8 +-
.../master/event/WorkflowStartEventHandler.java | 28 +-
.../server/master/event/WorkflowStateEvent.java | 9 +-
.../master/event/WorkflowStateEventHandler.java | 4 +-
.../event/WorkflowTimeoutStateEventHandler.java | 3 +-
.../server/master/metrics/MasterServerMetrics.java | 2 +-
.../master/metrics/ProcessInstanceMetrics.java | 26 +-
.../server/master/metrics/TaskMetrics.java | 14 +-
.../server/master/processor/CacheProcessor.java | 4 +-
.../processor/HostUpdateResponseProcessor.java | 7 +-
.../master/processor/StateEventProcessor.java | 6 +-
.../master/processor/TaskEventProcessor.java | 6 +-
.../processor/TaskExecuteResponseProcessor.java | 12 +-
.../processor/TaskExecuteRunningProcessor.java | 11 +-
.../processor/TaskExecuteStartProcessor.java | 15 +-
.../processor/TaskKillResponseProcessor.java | 9 +-
.../master/processor/TaskRecallProcessor.java | 8 +-
.../WorkflowExecutingDataRequestProcessor.java | 10 +-
.../processor/queue/StateEventResponseService.java | 17 +-
.../master/processor/queue/TaskEventService.java | 16 +-
.../processor/queue/TaskExecuteRunnable.java | 10 +-
.../processor/queue/TaskExecuteThreadPool.java | 21 +-
.../registry/MasterConnectionStateListener.java | 4 +-
.../master/registry/MasterRegistryClient.java | 10 +-
.../registry/MasterRegistryDataListener.java | 4 +-
.../server/master/registry/MasterStopStrategy.java | 1 +
.../master/registry/MasterWaitingStrategy.java | 5 +-
.../server/master/runner/EventExecuteService.java | 1 +
.../master/runner/FailoverExecuteThread.java | 1 +
.../master/runner/MasterSchedulerBootstrap.java | 4 +-
.../master/runner/StateWheelExecuteThread.java | 15 +-
.../master/runner/StreamTaskExecuteThreadPool.java | 4 +-
.../server/master/runner/WorkflowEventLooper.java | 12 +-
.../master/runner/WorkflowExecuteRunnable.java | 20 +-
.../master/runner/WorkflowExecuteThreadPool.java | 14 +-
.../master/runner/task/CommonTaskProcessor.java | 16 +-
.../server/master/runner/task/TaskInstanceKey.java | 7 +-
.../master/runner/task/TaskProcessorFactory.java | 19 +-
.../server/master/service/ExecutingService.java | 3 +-
.../server/master/service/FailoverService.java | 5 +-
.../server/master/task/MasterHeartBeatTask.java | 5 +-
.../server/master/utils/DependentExecute.java | 6 +-
.../server/master/utils/SwitchTaskUtils.java | 3 +-
.../server/master/ConditionsTaskTest.java | 11 +-
.../server/master/DependentTaskTest.java | 9 +-
.../dolphinscheduler/server/master/ParamsTest.java | 10 +-
.../server/master/SwitchTaskTest.java | 13 +-
.../ProcessInstanceExecCacheManagerImplTest.java | 2 +-
.../consumer/TaskPriorityQueueConsumerTest.java | 2 +-
.../master/dispatch/ExecutorDispatcherTest.java | 2 +-
.../executor/NettyExecutorManagerTest.java | 20 +-
.../dispatch/host/RoundRobinHostManagerTest.java | 3 +-
.../host/assign/LowerWeightRoundRobinTest.java | 30 +-
.../dispatch/host/assign/RandomSelectorTest.java | 6 +-
.../host/assign/RoundRobinSelectorTest.java | 13 +-
.../master/processor/TaskAckProcessorTest.java | 2 +-
.../processor/TaskResponseProcessorTestConfig.java | 2 +-
.../processor/queue/TaskResponseServiceTest.java | 2 +-
.../runner/task/CommonTaskProcessorTest.java | 36 +-
dolphinscheduler-meter/pom.xml | 33 +-
.../dolphinscheduler/meter/MeterConfiguration.java | 1 +
dolphinscheduler-microbench/pom.xml | 32 +-
.../microbench/base/AbstractBaseBenchmark.java | 1 -
.../microbench/common/EnumBenchMark.java | 23 +-
.../microbench/common/RpcTest.java | 1 +
.../microbench/common/UserCallback.java | 1 +
dolphinscheduler-python/pom.xml | 17 +-
.../pydolphinscheduler/DEVELOP.md | 4 +-
.../dolphinscheduler-registry-all/pom.xml | 7 +-
.../dolphinscheduler-registry-api/pom.xml | 8 +-
.../registry/api/ConnectStrategyProperties.java | 4 +-
.../registry/api/ConnectionListener.java | 1 +
.../dolphinscheduler/registry/api/Event.java | 8 +-
.../registry/api/SubscribeListener.java | 1 +
.../dolphinscheduler-registry-etcd/pom.xml | 9 +-
.../registry/etcd/EtcdConnectionStateListener.java | 2 +-
.../plugin/registry/etcd/EtcdRegistry.java | 44 +-
.../registry/etcd/EtcdRegistryProperties.java | 5 +-
.../dolphinscheduler-registry-mysql/pom.xml | 7 +-
.../plugin/registry/mysql/MysqlRegistry.java | 14 +-
.../registry/mysql/MysqlRegistryProperties.java | 4 +-
.../plugin/registry/mysql/model/DataType.java | 1 +
.../registry/mysql/task/RegistryLockManager.java | 8 +-
.../registry/mysql/task/SubscribeDataManager.java | 11 +-
.../ZookeeperConnectionStateListener.java | 2 +-
.../registry/zookeeper/ZookeeperRegistry.java | 27 +-
.../zookeeper/ZookeeperRegistryProperties.java | 3 +
.../dolphinscheduler-registry-plugins/pom.xml | 6 +-
dolphinscheduler-registry/pom.xml | 41 +-
.../remote/NettyRemotingClient.java | 61 ++-
.../remote/NettyRemotingServer.java | 15 +-
.../remote/codec/NettyDecoder.java | 1 +
.../remote/codec/NettyEncoder.java | 1 -
.../dolphinscheduler/remote/command/Command.java | 4 +-
.../remote/command/CommandType.java | 1 -
.../remote/command/HostUpdateCommand.java | 3 +-
.../remote/command/StateEventResponseCommand.java | 5 +-
.../remote/command/TaskDispatchCommand.java | 1 -
.../remote/command/TaskEventChangeCommand.java | 5 +-
.../remote/command/TaskExecuteResultCommand.java | 4 -
.../command/TaskExecuteRunningAckMessage.java | 7 +-
.../remote/command/TaskExecuteRunningCommand.java | 2 +-
.../remote/command/TaskKillResponseCommand.java | 9 +-
.../command/TaskSavePointResponseCommand.java | 8 +-
.../command/WorkflowStateEventChangeCommand.java | 5 +-
.../command/alert/AlertSendRequestCommand.java | 7 +-
.../command/alert/AlertSendResponseCommand.java | 7 +-
.../command/alert/AlertSendResponseResult.java | 4 +-
.../remote/command/log/GetAppIdRequestCommand.java | 7 +-
.../command/log/GetAppIdResponseCommand.java | 7 +-
.../command/log/GetLogBytesRequestCommand.java | 7 +-
.../command/log/GetLogBytesResponseCommand.java | 7 +-
.../command/log/RemoveTaskLogRequestCommand.java | 7 +-
.../command/log/RemoveTaskLogResponseCommand.java | 7 +-
.../command/log/RollViewLogRequestCommand.java | 7 +-
.../command/log/RollViewLogResponseCommand.java | 7 +-
.../remote/command/log/ViewLogRequestCommand.java | 7 +-
.../remote/command/log/ViewLogResponseCommand.java | 7 +-
.../remote/config/NettyClientConfig.java | 3 +-
.../remote/dto/TaskInstanceExecuteDto.java | 5 +-
.../remote/dto/WorkflowExecuteDto.java | 8 +-
.../remote/exceptions/RemotingException.java | 1 -
.../exceptions/RemotingTimeoutException.java | 4 +-
.../RemotingTooMuchRequestException.java | 2 +-
.../remote/future/ReleaseSemaphore.java | 6 +-
.../remote/future/ResponseFuture.java | 3 +-
.../remote/handler/NettyClientHandler.java | 6 +-
.../remote/handler/NettyServerHandler.java | 7 +-
.../remote/processor/NettyRemoteChannel.java | 5 +-
.../remote/processor/NettyRequestProcessor.java | 3 +-
.../processor/StateEventCallbackService.java | 3 +-
.../remote/utils/CallerThreadExecutePolicy.java | 6 +-
.../dolphinscheduler/remote/utils/Constants.java | 1 -
.../remote/utils/JsonSerializer.java | 1 +
.../remote/utils/NamedThreadFactory.java | 4 +-
.../org/apache/dolphinscheduler/rpc/base/Rpc.java | 5 +-
.../dolphinscheduler/rpc/base/RpcService.java | 1 +
.../rpc/client/ConsumerInterceptor.java | 8 +-
.../dolphinscheduler/rpc/codec/NettyDecoder.java | 3 +-
.../dolphinscheduler/rpc/codec/NettyEncoder.java | 3 +-
.../rpc/common/RequestEventType.java | 5 +-
.../rpc/common/ResponseEventType.java | 30 +-
.../rpc/common/ThreadPoolManager.java | 3 +-
.../dolphinscheduler/rpc/protocol/EventType.java | 6 +-
.../dolphinscheduler/rpc/remote/NettyClient.java | 8 +-
.../rpc/remote/NettyClientHandler.java | 4 +-
.../dolphinscheduler/rpc/remote/NettyServer.java | 23 +-
.../rpc/serializer/ProtoStuffSerializer.java | 30 +-
.../rpc/serializer/RpcSerializer.java | 31 +-
.../remote/NettyRemotingClientTest.java | 33 +-
.../command/alert/AlertSendRequestCommandTest.java | 4 +-
.../alert/AlertSendResponseCommandTest.java | 5 +-
.../command/cache/CacheExpireCommandTest.java | 1 +
.../remote/command/future/ResponseFutureTest.java | 10 +-
.../command/log/GetLogBytesRequestCommandTest.java | 1 +
.../log/GetLogBytesResponseCommandTest.java | 1 +
.../log/RemoveTaskLogRequestCommandTest.java | 1 +
.../log/RemoveTaskLogResponseCommandTest.java | 1 +
.../command/log/RollViewLogRequestCommandTest.java | 1 +
.../org/apache/dolphinscheduler/rpc/RpcTest.java | 1 +
.../dolphinscheduler-scheduler-api/pom.xml | 7 +-
.../scheduler/api/SchedulerApi.java | 2 +-
.../dolphinscheduler-scheduler-quartz/pom.xml | 7 +-
.../scheduler/quartz/ProcessScheduleTask.java | 14 +-
.../scheduler/quartz/QuartzScheduler.java | 19 +-
dolphinscheduler-scheduler-plugin/pom.xml | 11 +-
.../service/bean/SpringApplicationContext.java | 2 +-
.../service/cache/CacheNotifyService.java | 1 +
.../service/cron/AbstractCycle.java | 2 +-
.../dolphinscheduler/service/cron/CronUtils.java | 38 +-
.../service/cron/CycleFactory.java | 348 +++++++-------
.../dolphinscheduler/service/cron/CycleLinks.java | 86 ++--
.../service/expand/CuringParamsService.java | 12 +-
.../service/json/DateJsonSerializer.java | 1 +
.../service/queue/MasterPriorityQueue.java | 1 +
.../queue/PeerTaskInstancePriorityQueue.java | 11 +-
.../service/queue/TaskPriority.java | 73 +--
.../service/queue/TaskPriorityQueue.java | 3 +-
.../service/queue/TaskPriorityQueueImpl.java | 2 +-
.../service/task/TaskPluginManager.java | 8 +-
.../service/utils/ProcessData.java | 6 +-
.../service/alert/AlertClientServiceTest.java | 9 +-
.../service/alert/ProcessAlertManagerTest.java | 9 +-
.../service/cache/CacheNotifyServiceTest.java | 7 +-
.../service/cron/CronUtilsTest.java | 80 ++--
.../expand/CuringGlobalParamsServiceTest.java | 52 ++-
.../TimePlaceholderResolverExpandServiceTest.java | 4 +-
.../service/log/LogClientTest.java | 5 +-
.../service/log/LoggerRequestProcessorTest.java | 4 +-
.../service/log/MasterLogFilterTest.java | 8 +-
.../service/log/SensitiveDataConverterTest.java | 9 +-
.../service/log/TaskLogDiscriminatorTest.java | 6 +-
.../service/log/TaskLogFilterTest.java | 8 +-
.../service/log/WorkerLogFilterTest.java | 8 +-
.../service/process/ProcessServiceTest.java | 70 ++-
.../queue/PeerTaskInstancePriorityQueueTest.java | 8 +-
.../service/queue/TaskPriorityQueueImplTest.java | 49 +-
.../service/storage/impl/HadoopUtilsTest.java | 1 +
.../service/storage/impl/OssOperatorTest.java | 22 +-
.../service/utils/CommonUtilsTest.java | 7 +-
.../service/utils/LogUtilsTest.java | 12 +-
.../service/utils/ProcessUtilsTest.java | 11 +-
.../spi/datasource/DataSourceChannelFactory.java | 1 +
.../dolphinscheduler/spi/enums/CommandType.java | 2 +-
.../apache/dolphinscheduler/spi/enums/DbType.java | 8 +-
.../apache/dolphinscheduler/spi/enums/Flag.java | 1 +
.../dolphinscheduler/spi/enums/ResourceType.java | 1 +
.../spi/params/PluginParamsTransfer.java | 10 +-
.../spi/params/base/ParamsOptions.java | 3 +-
.../spi/params/base/PluginParams.java | 15 +-
.../dolphinscheduler/spi/params/base/Validate.java | 1 +
.../spi/params/fswitch/SwitchParam.java | 2 +-
.../spi/params/group/GroupParam.java | 6 +-
.../spi/params/input/InputParam.java | 2 +-
.../spi/params/radio/RadioParam.java | 4 +-
.../spi/plugin/PrioritySPIFactory.java | 9 +-
.../dolphinscheduler/spi/utils/Constants.java | 8 +-
.../dolphinscheduler/spi/utils/DateUtils.java | 4 +-
.../dolphinscheduler/spi/utils/JSONUtils.java | 21 +-
.../dolphinscheduler/spi/utils/StringUtils.java | 27 +-
.../spi/params/PluginParamsTransferTest.java | 67 +--
.../spi/plugin/PrioritySPIFactoryTest.java | 12 +-
.../dolphinscheduler/spi/utils/JSONUtilsTest.java | 26 +-
.../apache/dolphinscheduler/StandaloneServer.java | 4 +-
.../dolphinscheduler-task-all/pom.xml | 2 +-
.../plugin/task/api/AbstractShell.java | 19 +-
.../plugin/task/api/K8sTaskExecutionContext.java | 5 +-
.../plugin/task/api/ProcessUtils.java | 5 +-
.../plugin/task/api/SQLTaskExecutionContext.java | 1 -
.../plugin/task/api/ShellCommandExecutor.java | 6 +-
.../plugin/task/api/ShellExecutor.java | 4 +-
.../plugin/task/api/TaskChannelFactory.java | 2 +-
.../plugin/task/api/TaskConstants.java | 2 -
.../plugin/task/api/enums/DataType.java | 2 +-
.../plugin/task/api/enums/DependResult.java | 1 -
.../plugin/task/api/enums/DependentRelation.java | 2 +-
.../plugin/task/api/enums/Direct.java | 2 +-
.../plugin/task/api/enums/TaskTimeoutStrategy.java | 1 +
.../plugin/task/api/enums/UdfType.java | 1 +
.../plugin/task/api/enums/dp/CheckType.java | 13 +-
.../plugin/task/api/enums/dp/ConnectorType.java | 9 +-
.../task/api/enums/dp/DqFailureStrategy.java | 3 +-
.../plugin/task/api/enums/dp/DqTaskState.java | 11 +-
.../plugin/task/api/enums/dp/ExecuteSqlType.java | 11 +-
.../plugin/task/api/enums/dp/InputType.java | 13 +-
.../plugin/task/api/enums/dp/OperatorType.java | 17 +-
.../plugin/task/api/enums/dp/OptionSourceType.java | 13 +-
.../plugin/task/api/enums/dp/RuleType.java | 13 +-
.../plugin/task/api/enums/dp/ValueType.java | 13 +-
.../plugin/task/api/k8s/AbstractK8sTask.java | 6 +-
.../task/api/k8s/AbstractK8sTaskExecutor.java | 1 +
.../plugin/task/api/k8s/K8sTaskMainParameters.java | 14 +-
.../plugin/task/api/loop/LoopTaskDefinition.java | 4 +-
.../task/api/loop/LoopTaskInstanceStatus.java | 1 +
.../task/api/loop/LoopTaskMethodDefinition.java | 3 +-
.../api/loop/template/LoopTaskYamlDefinition.java | 5 +
.../loop/template/TemplateMethodTransformer.java | 3 +-
.../loop/template/http/HttpLoopTaskDefinition.java | 5 +-
.../http/HttpLoopTaskMethodDefinition.java | 1 +
.../HttpLoopTaskCancelTaskMethodDefinition.java | 5 +-
.../HttpLoopTaskQueryStatusMethodDefinition.java | 5 +-
.../HttpLoopTaskSubmitTaskMethodDefinition.java | 11 +-
.../parser/CancelTemplateMethodTransformer.java | 15 +-
.../http/parser/HttpTaskDefinitionParser.java | 16 +-
.../QueryStateTemplateMethodTransformer.java | 17 +-
.../parser/SubmitTemplateMethodTransformer.java | 17 +-
.../plugin/task/api/model/DateInterval.java | 1 +
.../plugin/task/api/model/DependentItem.java | 3 +-
.../plugin/task/api/model/DependentTaskModel.java | 3 +-
.../plugin/task/api/model/Property.java | 2 +-
.../plugin/task/api/model/SwitchResultVo.java | 2 +-
.../task/api/parameters/AbstractParameters.java | 3 +-
.../task/api/parameters/ConditionsParameters.java | 8 +-
.../task/api/parameters/DependentParameters.java | 5 +-
.../plugin/task/api/parameters/IParameters.java | 31 +-
.../task/api/parameters/K8sTaskParameters.java | 15 +-
.../plugin/task/api/parameters/ParametersNode.java | 1 +
.../task/api/parameters/SubProcessParameters.java | 2 +-
.../task/api/parameters/SwitchParameters.java | 2 +-
.../dataquality/DataQualityParameters.java | 4 +-
.../resource/AbstractResourceParameters.java | 1 -
.../parameters/resource/DataSourceParameters.java | 3 +-
.../plugin/task/api/parser/BusinessTimeUtils.java | 1 +
.../plugin/task/api/parser/ParamUtils.java | 8 +-
.../plugin/task/api/parser/ParameterUtils.java | 13 +-
.../plugin/task/api/parser/PlaceholderUtils.java | 10 +-
.../task/api/parser/PropertyPlaceholderHelper.java | 27 +-
.../task/api/parser/TimePlaceholderUtils.java | 69 +--
.../plugin/task/api/stream/StreamTask.java | 1 +
.../plugin/task/api/stream/StreamTaskChannel.java | 3 -
.../plugin/task/api/utils/DependentDateUtils.java | 2 +-
.../plugin/task/api/utils/JsonPathUtils.java | 8 +-
.../plugin/task/api/utils/OkHttpUtils.java | 6 +-
.../plugin/task/api/utils/RetryUtils.java | 1 +
.../plugin/task/api/model/JSONUtilsTest.java | 6 +-
.../plugin/task/api/utils/ParameterUtilsTest.java | 3 +-
.../dolphinscheduler-task-blocking/pom.xml | 7 +-
.../task/blocking/BlockingTaskChannelFactory.java | 1 +
.../dolphinscheduler-task-chunjun/pom.xml | 7 +-
.../plugin/task/chunjun/ChunJunParameters.java | 4 +-
.../plugin/task/chunjun/ChunJunTask.java | 29 +-
.../dolphinscheduler-task-conditions/pom.xml | 9 +-
.../conditions/ConditionsTaskChannelFactory.java | 1 +
.../dolphinscheduler-task-dataquality/pom.xml | 7 +-
.../plugin/task/dq/DataQualityTaskChannel.java | 2 +-
.../task/dq/exception/DataQualityException.java | 3 +-
.../plugin/task/dq/rule/RuleManager.java | 14 +-
.../plugin/task/dq/rule/parameter/BaseConfig.java | 4 +-
.../rule/parameter/DataQualityConfiguration.java | 3 +-
.../plugin/task/dq/rule/parameter/EnvConfig.java | 4 +-
.../plugin/task/dq/rule/parser/IRuleParser.java | 2 +-
.../plugin/task/dq/rule/parser/MappingColumn.java | 3 +-
.../rule/parser/MultiTableAccuracyRuleParser.java | 23 +-
.../parser/MultiTableComparisonRuleParser.java | 7 +-
.../parser/SingleTableCustomSqlRuleParser.java | 22 +-
.../task/dq/rule/parser/SingleTableRuleParser.java | 22 +-
.../plugin/task/dq/utils/RuleParserUtils.java | 311 +++++++------
.../plugin/task/dq/utils/SparkArgsUtils.java | 5 +-
.../dolphinscheduler-task-datasync/pom.xml | 9 +-
.../plugin/task/datasync/DatasyncParameters.java | 27 +-
.../plugin/task/datasync/DatasyncTaskChannel.java | 2 +-
.../task/datasync/DatasyncTaskChannelFactory.java | 5 +-
.../dolphinscheduler-task-datax/pom.xml | 7 +-
.../plugin/task/datax/DataxParameters.java | 7 +-
.../plugin/task/datax/DataxTask.java | 58 +--
.../plugin/task/datax/DataxUtils.java | 2 +-
.../plugin/task/datax/DataxTaskTest.java | 48 +-
.../dolphinscheduler-task-dependent/pom.xml | 9 +-
.../task/dependent/DependentTaskChannel.java | 3 +-
.../dependent/DependentTaskChannelFactory.java | 1 +
.../dolphinscheduler-task-dinky/pom.xml | 11 +-
.../plugin/task/dinky/DinkyParameters.java | 8 +-
.../plugin/task/dinky/DinkyTaskChannelFactory.java | 5 +-
.../plugin/task/dinky/DinkyTaskConstants.java | 5 +-
.../dolphinscheduler-task-dms/pom.xml | 7 +-
.../plugin/task/dms/DmsParameters.java | 6 +-
.../dolphinscheduler/plugin/task/dms/DmsTask.java | 19 +-
.../plugin/task/dms/DmsTaskChannelFactory.java | 1 -
.../dolphinscheduler-task-dvc/pom.xml | 7 +-
.../plugin/task/dvc/DvcConstants.java | 18 +-
.../plugin/task/dvc/DvcParameters.java | 21 +-
.../plugin/task/dvc/DvcTaskChannel.java | 2 -
.../plugin/task/dvc/DvcTaskChannelFactory.java | 9 +-
.../dolphinscheduler-task-emr/pom.xml | 7 +-
.../plugin/task/emr/AbstractEmrTask.java | 1 +
.../plugin/task/emr/EmrParameters.java | 15 +-
.../plugin/task/emr/EmrTaskChannel.java | 1 +
.../plugin/task/emr/EmrTaskChannelFactory.java | 1 +
.../dolphinscheduler-task-flink-stream/pom.xml | 9 +-
.../plugin/task/flink/FlinkStreamTaskChannel.java | 2 +-
.../task/flink/FlinkStreamTaskChannelFactory.java | 1 +
.../dolphinscheduler-task-flink/pom.xml | 27 +-
.../plugin/task/flink/FileUtils.java | 28 +-
.../plugin/task/flink/FlinkArgsUtils.java | 65 +--
.../plugin/task/flink/FlinkTaskChannel.java | 1 +
.../plugin/task/flink/FlinkTaskChannelFactory.java | 1 +
.../dolphinscheduler-task-http/pom.xml | 8 +-
.../plugin/task/http/HttpCheckCondition.java | 2 +-
.../plugin/task/http/HttpParameters.java | 1 +
.../plugin/task/http/HttpParametersType.java | 2 +-
.../plugin/task/http/HttpProperty.java | 1 +
.../plugin/task/http/HttpTask.java | 17 +-
.../dolphinscheduler-task-java/pom.xml | 11 +-
.../plugin/task/java/JavaConstants.java | 2 -
.../plugin/task/java/JavaParameters.java | 1 +
.../plugin/task/java/JavaTask.java | 14 +-
.../plugin/task/java/JavaTaskChannelFactory.java | 1 +
.../exception/JavaSourceFileExistException.java | 4 +-
.../exception/PublicClassNotFoundException.java | 4 +-
.../dolphinscheduler-task-jupyter/pom.xml | 7 +-
.../task/jupyter/JupyterTaskChannelFactory.java | 1 +
.../dolphinscheduler-task-k8s/pom.xml | 7 +-
.../plugin/task/k8s/K8sTaskChannel.java | 1 +
.../plugin/task/k8s/K8sTaskChannelFactory.java | 1 +
.../dolphinscheduler-task-mlflow/pom.xml | 7 +-
.../plugin/task/mlflow/MlflowConstants.java | 31 +-
.../plugin/task/mlflow/MlflowParameters.java | 11 +-
.../plugin/task/mlflow/MlflowTaskChannel.java | 1 -
.../task/mlflow/MlflowTaskChannelFactory.java | 8 +-
.../dolphinscheduler-task-mr/pom.xml | 7 +-
.../plugin/task/mr/MapReduceParameters.java | 3 +-
.../plugin/task/mr/MapReduceTask.java | 14 +-
.../plugin/task/mr/MapReduceTaskChannel.java | 1 +
.../dolphinscheduler-task-openmldb/pom.xml | 7 +-
.../plugin/task/openmldb/OpenmldbTaskChannel.java | 1 +
.../task/openmldb/OpenmldbTaskChannelFactory.java | 1 +
.../plugin/task/pigeon/PigeonConfig.java | 3 +-
.../plugin/task/pigeon/PigeonTaskChannel.java | 1 +
.../task/pigeon/PigeonTaskChannelFactory.java | 8 +-
.../dolphinscheduler-task-procedure/pom.xml | 7 +-
.../plugin/task/procedure/ProcedureParameters.java | 6 +-
.../dolphinscheduler-task-python/pom.xml | 7 +-
.../plugin/task/python/PythonParameters.java | 1 +
.../plugin/task/python/PythonTaskChannel.java | 1 +
.../task/python/PythonTaskChannelFactory.java | 31 +-
.../dolphinscheduler-task-pytorch/pom.xml | 7 +-
.../plugin/task/pytorch/GitProjectManager.java | 8 +-
.../plugin/task/pytorch/PytorchParameters.java | 2 -
.../plugin/task/pytorch/PytorchTask.java | 10 +-
.../task/pytorch/PytorchTaskChannelFactory.java | 1 +
.../plugin/task/sagemaker/SagemakerConstants.java | 1 +
.../sagemaker/SagemakerTaskChannelFactory.java | 1 +
.../dolphinscheduler-task-seatunnel/pom.xml | 7 +-
.../plugin/task/seatunnel/DeployModeEnum.java | 1 +
.../plugin/task/seatunnel/SeatunnelParameters.java | 7 +-
.../task/seatunnel/SeatunnelTaskChannel.java | 3 +-
.../seatunnel/flink/SeatunnelFlinkParameters.java | 1 +
.../task/seatunnel/flink/SeatunnelFlinkTask.java | 7 +-
.../seatunnel/spark/SeatunnelSparkParameters.java | 1 +
.../task/seatunnel/spark/SeatunnelSparkTask.java | 9 +-
.../dolphinscheduler-task-shell/pom.xml | 7 +-
.../plugin/task/shell/ShellTask.java | 9 +-
.../plugin/task/shell/ShellTaskChannelFactory.java | 1 +
.../dolphinscheduler-task-spark/pom.xml | 7 +-
.../plugin/task/spark/SparkTaskChannelFactory.java | 1 +
.../dolphinscheduler-task-sql/pom.xml | 7 +-
.../dolphinscheduler/plugin/task/sql/SqlBinds.java | 1 +
.../dolphinscheduler/plugin/task/sql/SqlTask.java | 60 ++-
.../plugin/task/sql/SqlTaskChannel.java | 1 +
.../plugin/task/sql/SqlTaskChannelFactory.java | 1 +
.../dolphinscheduler-task-sqoop/pom.xml | 7 +-
.../plugin/task/sqoop/SqoopConstants.java | 14 +-
.../plugin/task/sqoop/SqoopJobType.java | 2 +-
.../plugin/task/sqoop/SqoopTask.java | 11 +-
.../task/sqoop/generator/CommonGenerator.java | 28 +-
.../task/sqoop/generator/SqoopJobGenerator.java | 7 +-
.../generator/sources/HdfsSourceGenerator.java | 6 +-
.../generator/sources/HiveSourceGenerator.java | 16 +-
.../generator/sources/MySQLSourceGenerator.java | 29 +-
.../generator/targets/HdfsTargetGenerator.java | 12 +-
.../generator/targets/HiveTargetGenerator.java | 22 +-
.../generator/targets/MySQLTargetGenerator.java | 24 +-
.../task/sqoop/parameter/SqoopParameters.java | 34 +-
.../plugin/task/sqoop/EntityTestUtils.java | 12 +-
.../dolphinscheduler-task-subprocess/pom.xml | 9 +-
.../subprocess/SubProcessTaskChannelFactory.java | 1 +
.../dolphinscheduler-task-switch/pom.xml | 9 +-
.../plugin/task/switchtask/SwitchParameters.java | 7 +-
.../plugin/task/switchtask/SwitchResult.java | 1 +
.../task/switchtask/SwitchTaskChannelFactory.java | 4 +-
.../plugin/task/zeppelin/ZeppelinParameters.java | 7 +-
.../task/zeppelin/ZeppelinTaskChannelFactory.java | 1 +
dolphinscheduler-tools/pom.xml | 23 +-
.../tools/datasource/DolphinSchedulerManager.java | 19 +-
.../tools/datasource/InitDolphinScheduler.java | 2 +
.../tools/datasource/UpgradeDolphinScheduler.java | 2 +
.../tools/datasource/dao/MySQLUpgradeDao.java | 13 +-
.../tools/datasource/dao/PostgreSQLUpgradeDao.java | 2 +-
.../tools/datasource/dao/ResourceDao.java | 10 +-
dolphinscheduler-ui/pom.xml | 128 +++---
.../server/worker/WorkerServer.java | 11 +-
.../server/worker/message/MessageRetryRunner.java | 17 +-
.../message/TaskExecuteResultMessageSender.java | 8 +-
.../worker/message/TaskRejectMessageSender.java | 4 +-
.../server/worker/metrics/TaskMetrics.java | 6 +-
.../server/worker/metrics/WorkerServerMetrics.java | 28 +-
.../worker/processor/HostUpdateProcessor.java | 3 +-
.../worker/processor/TaskDispatchProcessor.java | 16 +-
.../processor/TaskExecuteResultAckProcessor.java | 6 +-
.../processor/TaskExecuteRunningAckProcessor.java | 2 +-
.../worker/processor/TaskRejectAckProcessor.java | 6 +-
.../worker/processor/TaskSavePointProcessor.java | 31 +-
.../registry/WorkerConnectionStateListener.java | 4 +-
.../server/worker/registry/WorkerStopStrategy.java | 1 +
.../worker/registry/WorkerWaitingStrategy.java | 5 +-
.../server/worker/rpc/WorkerMessageSender.java | 6 +-
.../server/worker/rpc/WorkerRpcClient.java | 2 +-
.../DefaultWorkerDelayTaskExecuteRunnable.java | 6 +-
...faultWorkerDelayTaskExecuteRunnableFactory.java | 10 +-
.../runner/WorkerDelayTaskExecuteRunnable.java | 12 +-
.../WorkerDelayTaskExecuteRunnableFactory.java | 22 +-
.../server/worker/runner/WorkerExecService.java | 2 +-
.../server/worker/runner/WorkerManagerThread.java | 13 +-
.../worker/runner/WorkerTaskExecuteRunnable.java | 13 +-
.../WorkerTaskExecuteRunnableFactoryBuilder.java | 5 +-
.../worker/utils/TaskExecutionCheckerUtils.java | 2 +-
.../server/worker/config/BeanConfigTest.java | 3 +-
.../processor/TaskDispatchProcessorTest.java | 4 +-
.../DefaultWorkerDelayTaskExecuteRunnableTest.java | 12 +-
pom.xml | 15 +-
tools/release/README.md | 1 +
948 files changed, 5903 insertions(+), 4733 deletions(-)
diff --git a/docs/docs/en/about/glossary.md b/docs/docs/en/about/glossary.md
index a8f844c06f..29f0da5a5a 100644
--- a/docs/docs/en/about/glossary.md
+++ b/docs/docs/en/about/glossary.md
@@ -17,7 +17,7 @@ there are no subsequent nodes. Examples are as follows:
manual start or scheduled scheduling. Each time the process definition runs, a process instance is generated
**Task instance**: The task instance is the instantiation of the task node in the process definition, which identifies
-the specific task
+the specific task
**Task type**: Currently supports SHELL, SQL, SUB_PROCESS (sub-process), PROCEDURE, MR, SPARK, PYTHON, DEPENDENT (
depends), and plans to support dynamic plug-in expansion, note: **SUB_PROCESS** need relation with another workflow definition which also a separate process
diff --git a/docs/docs/en/about/hardware.md b/docs/docs/en/about/hardware.md
index 97488332d4..604bb6a90e 100644
--- a/docs/docs/en/about/hardware.md
+++ b/docs/docs/en/about/hardware.md
@@ -49,4 +49,5 @@ DolphinScheduler provides the following network port configurations for normal o
The minimum supported version of Google Chrome is version 85, but version 90 or above is recommended.
## Synchronize clocks
-To avoid problems with internal cluster communications that can impact your task execution, make sure that the clocks on all of the cluster nodes are synchronized from a common clock source, such as using Chrony and/or NTP. Synchronizing the time ensures that every node in the cluster has the same time.
\ No newline at end of file
+
+To avoid problems with internal cluster communications that can impact your task execution, make sure that the clocks on all of the cluster nodes are synchronized from a common clock source, such as using Chrony and/or NTP. Synchronizing the time ensures that every node in the cluster has the same time.
diff --git a/docs/docs/en/contribute/join/become-a-committer.md b/docs/docs/en/contribute/join/become-a-committer.md
index a64c854a0e..f748a1638c 100644
--- a/docs/docs/en/contribute/join/become-a-committer.md
+++ b/docs/docs/en/contribute/join/become-a-committer.md
@@ -20,7 +20,7 @@ In Dolphinscheduler, **new committer nomination** could only be officially start
The following steps are recommended (to be initiated only by an existing PMC member):
1. Send an email titled `[DISCUSS] Promote xxx as new committer` to `private@dolphinscheduler.apache.org`. List the important contributions of the candidate,
- so you could gather support from other PMC members for your proposal.
+so you could gather support from other PMC members for your proposal.
2. Keep the discussion open for more than 3 days but no more than 1 week, unless there is any express objection or concern.
3. If the PMC generally agrees to the proposal, send an email titled `[VOTE] Promote xxx as new committer` to `private@dolphinscheduler.apache.org`.
4. Keep the voting process open for more than 3 days, but no more than 1 week. Consider the result as `Consensus Approval` if there are `3 + 1` votes with `NO` vetos. Please note that +1 votes > -1 votes.
@@ -31,6 +31,7 @@ The following steps are recommended (to be initiated only by an existing PMC mem
The PMC member who starts the promotion is responsible for sending an invitation to the new committer and guiding him/her to set up the ASF env.
The PMC member should send an email using the following template to the new committer:
+
```
To: <invitee name>@gmail.com
Cc: private@dolphinscheduler.apache.org
diff --git a/docs/docs/en/guide/datasource/oracle.md b/docs/docs/en/guide/datasource/oracle.md
index f7ab96e1dd..122801a2d9 100644
--- a/docs/docs/en/guide/datasource/oracle.md
+++ b/docs/docs/en/guide/datasource/oracle.md
@@ -4,18 +4,18 @@
## Datasource Parameters
-| **Datasource** | **Description** |
-|-------------------------|---------------------------------------------------------------------------------------------------------------------------------------------|
-| Datasource | Select Oracle. |
-| Datasource Name | Enter the name of the datasource. |
-| Description | Enter a description of the datasource. |
-| IP/Host Name | Enter the Oracle service IP. |
-| Port | Enter the Oracle service port. |
-| Username | Set the username for Oracle connection. |
-| Password | Set the password for Oracle connection. |
-| Database Name | Enter the ServiceName or SID of the Oracle connection. |
-| ServiceName or SID | Choose ServiceName or SID according to your entry in Database Name column. |
-| jdbc connect parameters | Parameter settings for Oracle connection, in JSON format. For example, you can use {"schema": "abc"} to specify database abc for using. |
+| **Datasource** | **Description** |
+|-------------------------|-----------------------------------------------------------------------------------------------------------------------------------------|
+| Datasource | Select Oracle. |
+| Datasource Name | Enter the name of the datasource. |
+| Description | Enter a description of the datasource. |
+| IP/Host Name | Enter the Oracle service IP. |
+| Port | Enter the Oracle service port. |
+| Username | Set the username for Oracle connection. |
+| Password | Set the password for Oracle connection. |
+| Database Name | Enter the ServiceName or SID of the Oracle connection. |
+| ServiceName or SID | Choose ServiceName or SID according to your entry in Database Name column. |
+| jdbc connect parameters | Parameter settings for Oracle connection, in JSON format. For example, you can use {"schema": "abc"} to specify database abc for using. |
## Native Supported
diff --git a/docs/docs/en/guide/installation/standalone.md b/docs/docs/en/guide/installation/standalone.md
index 30ee2a138f..d11f70f41e 100644
--- a/docs/docs/en/guide/installation/standalone.md
+++ b/docs/docs/en/guide/installation/standalone.md
@@ -2,8 +2,8 @@
Standalone only for quick experience for DolphinScheduler.
-If you are a newbie and want to experience DolphinScheduler functions, we recommend you install follow [Standalone deployment](standalone.md).
-If you want to experience more complete functions and schedule massive tasks, we recommend you install follow [pseudo-cluster deployment](pseudo-cluster.md).
+If you are a newbie and want to experience DolphinScheduler functions, we recommend you install follow [Standalone deployment](standalone.md).
+If you want to experience more complete functions and schedule massive tasks, we recommend you install follow [pseudo-cluster deployment](pseudo-cluster.md).
If you want to deploy DolphinScheduler in production, we recommend you follow [cluster deployment](cluster.md) or [Kubernetes deployment](kubernetes.md).
> **_Note:_** Standalone only recommends the usage of fewer than 20 workflows, because it uses in-memory H2 Database in default, ZooKeeper Testing Server, too many tasks may cause instability.
diff --git a/docs/docs/en/guide/upgrade/incompatible.md b/docs/docs/en/guide/upgrade/incompatible.md
index 0fd2c409ea..ba1af107ce 100644
--- a/docs/docs/en/guide/upgrade/incompatible.md
+++ b/docs/docs/en/guide/upgrade/incompatible.md
@@ -11,3 +11,4 @@ This document records the incompatible updates between each version. You need to
* Copy and import workflow without 'copy' suffix [#10607](https://github.com/apache/dolphinscheduler/pull/10607)
* Use semicolon as default sql segment separator [#10869](https://github.com/apache/dolphinscheduler/pull/10869)
+
diff --git a/docs/docs/zh/about/hardware.md b/docs/docs/zh/about/hardware.md
index 2ad98f4a6a..bba384925e 100644
--- a/docs/docs/zh/about/hardware.md
+++ b/docs/docs/zh/about/hardware.md
@@ -47,4 +47,5 @@ DolphinScheduler正常运行提供如下的网络端口配置：
DolphinScheduler 推荐 Chrome 以及使用 Chromium 内核的较新版本浏览器访问前端可视化操作界面
## 时钟同步
-为避免可能影响任务执行的内部集群通信问题，请确保所有集群节点上的时钟与公共时钟源同步，例如使用 Chrony 和/或 NTP。 同步时间确保集群中的每个节点都有相同的时间
\ No newline at end of file
+
+为避免可能影响任务执行的内部集群通信问题，请确保所有集群节点上的时钟与公共时钟源同步，例如使用 Chrony 和/或 NTP。 同步时间确保集群中的每个节点都有相同的时间
diff --git a/docs/docs/zh/contribute/join/become-a-committer.md b/docs/docs/zh/contribute/join/become-a-committer.md
index 720b31d6f1..a1b5849972 100644
--- a/docs/docs/zh/contribute/join/become-a-committer.md
+++ b/docs/docs/zh/contribute/join/become-a-committer.md
@@ -28,6 +28,7 @@ PMC会定期基于活跃贡献者们对Dolphinscheduler的贡献从他们中提
发起提名的PMC成员负责向新的committer发出邀请，并指导他/她建立ASF精神思想。
PMC成员应使用以下模板向新的committer发送一封电子邮件:
+
```
To: <invitee name>@gmail.com
Cc: private@dolphinscheduler.apache.org
diff --git a/docs/docs/zh/guide/datasource/oracle.md b/docs/docs/zh/guide/datasource/oracle.md
index 581b0d8dd8..de5f07086f 100644
--- a/docs/docs/zh/guide/datasource/oracle.md
+++ b/docs/docs/zh/guide/datasource/oracle.md
@@ -12,3 +12,4 @@
- 数据库名：输入连接 ORACLE 的 ServiceName 或 SID
- Jdbc 连接参数：用于 ORACLE 连接的参数设置，以 JSON 形式填写
- 比如 `{"schema": "abc"}` 指定使用 `username` 用户下的 `abc` 数据库
+
diff --git a/docs/docs/zh/guide/parameter/built-in.md b/docs/docs/zh/guide/parameter/built-in.md
index 4838c382d9..abf5ade789 100644
--- a/docs/docs/zh/guide/parameter/built-in.md
+++ b/docs/docs/zh/guide/parameter/built-in.md
@@ -29,33 +29,34 @@
- 也可以通过以下两种方式：
- 1.使用add_months()函数，该函数用于加减月份，
- 第一个入口参数为[yyyyMMdd]，表示返回时间的格式
- 第二个入口参数为月份偏移量，表示加减多少个月
- * 后 N 年：$[add_months(yyyyMMdd,12*N)]
- * 前 N 年：$[add_months(yyyyMMdd,-12*N)]
- * 后 N 月：$[add_months(yyyyMMdd,N)]
- * 前 N 月：$[add_months(yyyyMMdd,-N)]
- *******************************************
- 2.直接加减数字
- 在自定义格式后直接“+/-”数字
- * 后 N 周：$[yyyyMMdd+7*N]
- * 前 N 周：$[yyyyMMdd-7*N]
- * 后 N 天：$[yyyyMMdd+N]
- * 前 N 天：$[yyyyMMdd-N]
- * 后 N 小时：$[HHmmss+N/24]
- * 前 N 小时：$[HHmmss-N/24]
- * 后 N 分钟：$[HHmmss+N/24/60]
- * 前 N 分钟：$[HHmmss-N/24/60]
- *******************************************
- 3.业务属性方式
- 在自定义格式后直接“+/-”数字
- 支持日志格式：所有日期表达式，例如：yyyy-MM-dd/yyyyMMddHHmmss
- * 当天：$[this_day(yyyy-MM-dd)]，如：2022-08-26 => 2022-08-26
- * 昨天：$[last_day(yyyy-MM-dd)]，如：2022-08-26 => 2022-08-25
- * 年的第N周，以周一为起点：$[year_week(yyyy-MM-dd)]，如：2022-08-26 => 2022-34
- * 年的第N周，以周N为起点：$[year_week(yyyy-MM-dd,N)]，如：N=5时 2022-08-26 => 2022-35
- * 前(-)/后(+) N 月第一天：$[month_first_day(yyyy-MM-dd,-N)]，如：N=1时 2022-08-26 => 2022-07-01
- * 前(-)/后(+) N 月最后一天：$[month_last_day(yyyy-MM-dd,-N)]，如：N=1时 2022-08-28 => 2022-07-31
- * 前(-)/后(+) N 周的周一：$[week_first_day(yyyy-MM-dd,-N)]，如：N=1 2022-08-26 => 2022-08-15
- * 前(-)/后(+) N 周的周日：$[week_last_day(yyyy-MM-dd,-N)]，如：N=1 2022-08-26 => 2022-08-21
+ 1.使用add_months()函数，该函数用于加减月份，
+ 第一个入口参数为[yyyyMMdd]，表示返回时间的格式
+ 第二个入口参数为月份偏移量，表示加减多少个月
+ * 后 N 年：$[add_months(yyyyMMdd,12*N)]
+ * 前 N 年：$[add_months(yyyyMMdd,-12*N)]
+ * 后 N 月：$[add_months(yyyyMMdd,N)]
+ * 前 N 月：$[add_months(yyyyMMdd,-N)]
+ *******************************************
+ 2.直接加减数字
+ 在自定义格式后直接“+/-”数字
+ * 后 N 周：$[yyyyMMdd+7*N]
+ * 前 N 周：$[yyyyMMdd-7*N]
+ * 后 N 天：$[yyyyMMdd+N]
+ * 前 N 天：$[yyyyMMdd-N]
+ * 后 N 小时：$[HHmmss+N/24]
+ * 前 N 小时：$[HHmmss-N/24]
+ * 后 N 分钟：$[HHmmss+N/24/60]
+ * 前 N 分钟：$[HHmmss-N/24/60]
+ *******************************************
+ 3.业务属性方式
+ 在自定义格式后直接“+/-”数字
+ 支持日志格式：所有日期表达式，例如：yyyy-MM-dd/yyyyMMddHHmmss
+ * 当天：$[this_day(yyyy-MM-dd)]，如：2022-08-26 => 2022-08-26
+ * 昨天：$[last_day(yyyy-MM-dd)]，如：2022-08-26 => 2022-08-25
+ * 年的第N周，以周一为起点：$[year_week(yyyy-MM-dd)]，如：2022-08-26 => 2022-34
+ * 年的第N周，以周N为起点：$[year_week(yyyy-MM-dd,N)]，如：N=5时 2022-08-26 => 2022-35
+ * 前(-)/后(+) N 月第一天：$[month_first_day(yyyy-MM-dd,-N)]，如：N=1时 2022-08-26 => 2022-07-01
+ * 前(-)/后(+) N 月最后一天：$[month_last_day(yyyy-MM-dd,-N)]，如：N=1时 2022-08-28 => 2022-07-31
+ * 前(-)/后(+) N 周的周一：$[week_first_day(yyyy-MM-dd,-N)]，如：N=1 2022-08-26 => 2022-08-15
+ * 前(-)/后(+) N 周的周日：$[week_last_day(yyyy-MM-dd,-N)]，如：N=1 2022-08-26 => 2022-08-21
+
diff --git a/docs/docs/zh/guide/upgrade/incompatible.md b/docs/docs/zh/guide/upgrade/incompatible.md
index 0bc0a7e675..4e294f954d 100644
--- a/docs/docs/zh/guide/upgrade/incompatible.md
+++ b/docs/docs/zh/guide/upgrade/incompatible.md
@@ -11,3 +11,4 @@
* Copy and import workflow without 'copy' suffix [#10607](https://github.com/apache/dolphinscheduler/pull/10607)
* Use semicolon as default sql segment separator [#10869](https://github.com/apache/dolphinscheduler/pull/10869)
+
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-api/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-api/pom.xml
index 45ec526859..9719689f39 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-api/pom.xml
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-api/pom.xml
@@ -17,22 +17,21 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>dolphinscheduler-alert</artifactId>
<groupId>org.apache.dolphinscheduler</groupId>
+ <artifactId>dolphinscheduler-alert</artifactId>
<version>dev-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>dolphinscheduler-alert-api</artifactId>
<dependencies>
<dependency>
<groupId>org.apache.dolphinscheduler</groupId>
- <artifactId>dolphinscheduler-spi</artifactId> <!-- TODO should get rid off this -->
+ <artifactId>dolphinscheduler-spi</artifactId>
+ <!-- TODO should get rid off this -->
</dependency>
</dependencies>
</project>
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/AlertChannel.java b/dolphinscheduler-alert/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/AlertChannel.java
index b461555a0e..530a548342 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/AlertChannel.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/AlertChannel.java
@@ -25,6 +25,7 @@ import lombok.NonNull;
* alert channel for sending alerts
*/
public interface AlertChannel {
+
/**
* process and send alert
*
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/AlertChannelFactory.java b/dolphinscheduler-alert/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/AlertChannelFactory.java
index 0f9878485c..55097ee3af 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/AlertChannelFactory.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/AlertChannelFactory.java
@@ -20,8 +20,8 @@
package org.apache.dolphinscheduler.alert.api;
import org.apache.dolphinscheduler.spi.params.base.PluginParams;
-import org.apache.dolphinscheduler.spi.plugin.SPIIdentify;
import org.apache.dolphinscheduler.spi.plugin.PrioritySPI;
+import org.apache.dolphinscheduler.spi.plugin.SPIIdentify;
import java.util.List;
@@ -29,6 +29,7 @@ import java.util.List;
* alert channel factory
*/
public interface AlertChannelFactory extends PrioritySPI {
+
/**
* Returns the name of the alert channel
*
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/AlertConstants.java b/dolphinscheduler-alert/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/AlertConstants.java
index 6c0848fc9d..a94a31a8a9 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/AlertConstants.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/AlertConstants.java
@@ -20,6 +20,7 @@
package org.apache.dolphinscheduler.alert.api;
public final class AlertConstants {
+
/**
* the field name of alert show type
**/
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/ShowType.java b/dolphinscheduler-alert/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/ShowType.java
index 95dccae7eb..46b87320c6 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/ShowType.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-api/src/main/java/org/apache/dolphinscheduler/alert/api/ShowType.java
@@ -25,6 +25,7 @@ import lombok.Getter;
@AllArgsConstructor
@Getter
public enum ShowType {
+
/**
* 0 TABLE;
* 1 TEXT;
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-dingtalk/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-dingtalk/pom.xml
index 34b1ef3335..5ce2f6d9d1 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-dingtalk/pom.xml
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-dingtalk/pom.xml
@@ -15,15 +15,14 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>dolphinscheduler-alert-plugins</artifactId>
<groupId>org.apache.dolphinscheduler</groupId>
+ <artifactId>dolphinscheduler-alert-plugins</artifactId>
<version>dev-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>dolphinscheduler-alert-dingtalk</artifactId>
<packaging>jar</packaging>
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-dingtalk/src/main/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkAlertChannelFactory.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-dingtalk/src/main/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkAlertChannelFactory.java
index 235f61c4d3..bfa694cd28 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-dingtalk/src/main/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkAlertChannelFactory.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-dingtalk/src/main/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkAlertChannelFactory.java
@@ -38,6 +38,7 @@ import com.google.auto.service.AutoService;
@AutoService(AlertChannelFactory.class)
public final class DingTalkAlertChannelFactory implements AlertChannelFactory {
+
@Override
public String name() {
return "DingTalk";
@@ -67,8 +68,10 @@ public final class DingTalkAlertChannelFactory implements AlertChannelFactory {
RadioParam msgTypeParam = RadioParam
.newBuilder(DingTalkParamsConstants.NAME_DING_TALK_MSG_TYPE, DingTalkParamsConstants.DING_TALK_MSG_TYPE)
- .addParamsOptions(new ParamsOptions(DingTalkParamsConstants.DING_TALK_MSG_TYPE_TEXT, DingTalkParamsConstants.DING_TALK_MSG_TYPE_TEXT, false))
- .addParamsOptions(new ParamsOptions(DingTalkParamsConstants.DING_TALK_MSG_TYPE_MARKDOWN, DingTalkParamsConstants.DING_TALK_MSG_TYPE_MARKDOWN, false))
+ .addParamsOptions(new ParamsOptions(DingTalkParamsConstants.DING_TALK_MSG_TYPE_TEXT,
+ DingTalkParamsConstants.DING_TALK_MSG_TYPE_TEXT, false))
+ .addParamsOptions(new ParamsOptions(DingTalkParamsConstants.DING_TALK_MSG_TYPE_MARKDOWN,
+ DingTalkParamsConstants.DING_TALK_MSG_TYPE_MARKDOWN, false))
.setValue(DingTalkParamsConstants.DING_TALK_MSG_TYPE_TEXT)
.addValidate(Validate.newBuilder()
.setRequired(false)
@@ -76,13 +79,15 @@ public final class DingTalkAlertChannelFactory implements AlertChannelFactory {
.build();
InputParam atMobilesParam = InputParam
- .newBuilder(DingTalkParamsConstants.NAME_DING_TALK_AT_MOBILES, DingTalkParamsConstants.DING_TALK_AT_MOBILES)
+ .newBuilder(DingTalkParamsConstants.NAME_DING_TALK_AT_MOBILES,
+ DingTalkParamsConstants.DING_TALK_AT_MOBILES)
.addValidate(Validate.newBuilder()
.setRequired(false)
.build())
.build();
InputParam atUserIdsParam = InputParam
- .newBuilder(DingTalkParamsConstants.NAME_DING_TALK_AT_USERIDS, DingTalkParamsConstants.DING_TALK_AT_USERIDS)
+ .newBuilder(DingTalkParamsConstants.NAME_DING_TALK_AT_USERIDS,
+ DingTalkParamsConstants.DING_TALK_AT_USERIDS)
.addValidate(Validate.newBuilder()
.setRequired(false)
.build())
@@ -98,7 +103,8 @@ public final class DingTalkAlertChannelFactory implements AlertChannelFactory {
.build();
RadioParam isEnableProxy = RadioParam
- .newBuilder(DingTalkParamsConstants.NAME_DING_TALK_PROXY_ENABLE, DingTalkParamsConstants.DING_TALK_PROXY_ENABLE)
+ .newBuilder(DingTalkParamsConstants.NAME_DING_TALK_PROXY_ENABLE,
+ DingTalkParamsConstants.DING_TALK_PROXY_ENABLE)
.addParamsOptions(new ParamsOptions(STRING_YES, STRING_TRUE, false))
.addParamsOptions(new ParamsOptions(STRING_NO, STRING_FALSE, false))
.setValue(STRING_FALSE)
@@ -131,7 +137,8 @@ public final class DingTalkAlertChannelFactory implements AlertChannelFactory {
.setPlaceholder("if enable use authentication, you need input password")
.build();
- return Arrays.asList(webHookParam, keywordParam, secretParam, msgTypeParam, atMobilesParam, atUserIdsParam, isAtAll, isEnableProxy, proxyParam, portParam, userParam, passwordParam);
+ return Arrays.asList(webHookParam, keywordParam, secretParam, msgTypeParam, atMobilesParam, atUserIdsParam,
+ isAtAll, isEnableProxy, proxyParam, portParam, userParam, passwordParam);
}
@Override
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-dingtalk/src/main/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkParamsConstants.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-dingtalk/src/main/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkParamsConstants.java
index e5b667ae30..d68a1bde52 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-dingtalk/src/main/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkParamsConstants.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-dingtalk/src/main/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkParamsConstants.java
@@ -18,6 +18,7 @@
package org.apache.dolphinscheduler.plugin.alert.dingtalk;
public final class DingTalkParamsConstants {
+
static final String DING_TALK_PROXY_ENABLE = "$t('isEnableProxy')";
static final String NAME_DING_TALK_PROXY_ENABLE = "IsEnableProxy";
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-dingtalk/src/main/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkSender.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-dingtalk/src/main/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkSender.java
index f8a824aec8..617d051794 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-dingtalk/src/main/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkSender.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-dingtalk/src/main/java/org/apache/dolphinscheduler/plugin/alert/dingtalk/DingTalkSender.java
@@ -171,7 +171,8 @@ public final class DingTalkSender {
String msg = generateMsgJson(title, content);
- HttpPost httpPost = constructHttpPost(org.apache.dolphinscheduler.spi.utils.StringUtils.isBlank(secret) ? url : generateSignedUrl(), msg);
+ HttpPost httpPost = constructHttpPost(
+ org.apache.dolphinscheduler.spi.utils.StringUtils.isBlank(secret) ? url : generateSignedUrl(), msg);
CloseableHttpClient httpClient;
if (Boolean.TRUE.equals(enableProxy)) {
@@ -289,8 +290,12 @@ public final class DingTalkSender {
private void setMsgAt(Map<String, Object> items) {
Map<String, Object> at = new HashMap<>();
- String[] atMobileArray = org.apache.dolphinscheduler.spi.utils.StringUtils.isNotBlank(atMobiles) ? atMobiles.split(",") : new String[0];
- String[] atUserArray = org.apache.dolphinscheduler.spi.utils.StringUtils.isNotBlank(atUserIds) ? atUserIds.split(",") : new String[0];
+ String[] atMobileArray =
+ org.apache.dolphinscheduler.spi.utils.StringUtils.isNotBlank(atMobiles) ? atMobiles.split(",")
+ : new String[0];
+ String[] atUserArray =
+ org.apache.dolphinscheduler.spi.utils.StringUtils.isNotBlank(atUserIds) ? atUserIds.split(",")
+ : new String[0];
boolean isAtAll = Objects.isNull(atAll) ? false : atAll;
at.put("atMobiles", atMobileArray);
@@ -313,7 +318,7 @@ public final class DingTalkSender {
Mac mac = Mac.getInstance("HmacSHA256");
mac.init(new SecretKeySpec(secret.getBytes("UTF-8"), "HmacSHA256"));
byte[] signData = mac.doFinal(stringToSign.getBytes("UTF-8"));
- sign = URLEncoder.encode(new String(Base64.encodeBase64(signData)),"UTF-8");
+ sign = URLEncoder.encode(new String(Base64.encodeBase64(signData)), "UTF-8");
} catch (Exception e) {
logger.error("generate sign error, message:{}", e);
}
@@ -321,6 +326,7 @@ public final class DingTalkSender {
}
static final class DingTalkSendMsgResponse {
+
private Integer errcode;
private String errmsg;
@@ -378,7 +384,8 @@ public final class DingTalkSender {
@Override
public String toString() {
- return "DingTalkSender.DingTalkSendMsgResponse(errcode=" + this.getErrcode() + ", errmsg=" + this.getErrmsg() + ")";
+ return "DingTalkSender.DingTalkSendMsgResponse(errcode=" + this.getErrcode() + ", errmsg="
+ + this.getErrmsg() + ")";
}
}
}
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/pom.xml
index 1ec2302022..4669d7eac0 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/pom.xml
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/pom.xml
@@ -15,15 +15,14 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>dolphinscheduler-alert-plugins</artifactId>
<groupId>org.apache.dolphinscheduler</groupId>
+ <artifactId>dolphinscheduler-alert-plugins</artifactId>
<version>dev-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>dolphinscheduler-alert-email</artifactId>
<packaging>jar</packaging>
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannel.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannel.java
index 3c29ca24f5..663d251ea3 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannel.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannel.java
@@ -28,6 +28,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public final class EmailAlertChannel implements AlertChannel {
+
private static final Logger logger = LoggerFactory.getLogger(EmailAlertChannel.class);
@Override
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannelFactory.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannelFactory.java
index 2f5d6aae28..8a38cfa370 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannelFactory.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailAlertChannelFactory.java
@@ -40,6 +40,7 @@ import com.google.auto.service.AutoService;
@AutoService(AlertChannelFactory.class)
public final class EmailAlertChannelFactory implements AlertChannelFactory {
+
@Override
public String name() {
return "Email";
@@ -48,73 +49,88 @@ public final class EmailAlertChannelFactory implements AlertChannelFactory {
@Override
public List<PluginParams> params() {
List<PluginParams> paramsList = new ArrayList<>();
- InputParam receivesParam = InputParam.newBuilder(MailParamsConstants.NAME_PLUGIN_DEFAULT_EMAIL_RECEIVERS, MailParamsConstants.PLUGIN_DEFAULT_EMAIL_RECEIVERS)
- .setPlaceholder("please input receives")
- .addValidate(Validate.newBuilder()
- .setRequired(true)
- .build())
- .build();
-
- InputParam receiveCcsParam = InputParam.newBuilder(MailParamsConstants.NAME_PLUGIN_DEFAULT_EMAIL_RECEIVERCCS, MailParamsConstants.PLUGIN_DEFAULT_EMAIL_RECEIVERCCS)
- .build();
-
- InputParam mailSmtpHost = InputParam.newBuilder(MailParamsConstants.NAME_MAIL_SMTP_HOST, MailParamsConstants.MAIL_SMTP_HOST)
- .addValidate(Validate.newBuilder().setRequired(true).build())
- .build();
-
- InputParam mailSmtpPort = InputParam.newBuilder(MailParamsConstants.NAME_MAIL_SMTP_PORT, MailParamsConstants.MAIL_SMTP_PORT)
- .setValue("25")
- .addValidate(Validate.newBuilder()
- .setRequired(true)
- .build())
- .build();
-
- InputParam mailSender = InputParam.newBuilder(MailParamsConstants.NAME_MAIL_SENDER, MailParamsConstants.MAIL_SENDER)
- .addValidate(Validate.newBuilder().setRequired(true).build())
- .build();
-
- RadioParam enableSmtpAuth = RadioParam.newBuilder(MailParamsConstants.NAME_MAIL_SMTP_AUTH, MailParamsConstants.MAIL_SMTP_AUTH)
- .addParamsOptions(new ParamsOptions(STRING_YES, STRING_TRUE, false))
- .addParamsOptions(new ParamsOptions(STRING_NO, STRING_FALSE, false))
- .setValue(STRING_TRUE)
- .addValidate(Validate.newBuilder().setRequired(true).build())
- .build();
+ InputParam receivesParam = InputParam
+ .newBuilder(MailParamsConstants.NAME_PLUGIN_DEFAULT_EMAIL_RECEIVERS,
+ MailParamsConstants.PLUGIN_DEFAULT_EMAIL_RECEIVERS)
+ .setPlaceholder("please input receives")
+ .addValidate(Validate.newBuilder()
+ .setRequired(true)
+ .build())
+ .build();
+
+ InputParam receiveCcsParam = InputParam
+ .newBuilder(MailParamsConstants.NAME_PLUGIN_DEFAULT_EMAIL_RECEIVERCCS,
+ MailParamsConstants.PLUGIN_DEFAULT_EMAIL_RECEIVERCCS)
+ .build();
+
+ InputParam mailSmtpHost =
+ InputParam.newBuilder(MailParamsConstants.NAME_MAIL_SMTP_HOST, MailParamsConstants.MAIL_SMTP_HOST)
+ .addValidate(Validate.newBuilder().setRequired(true).build())
+ .build();
+
+ InputParam mailSmtpPort =
+ InputParam.newBuilder(MailParamsConstants.NAME_MAIL_SMTP_PORT, MailParamsConstants.MAIL_SMTP_PORT)
+ .setValue("25")
+ .addValidate(Validate.newBuilder()
+ .setRequired(true)
+ .build())
+ .build();
+
+ InputParam mailSender =
+ InputParam.newBuilder(MailParamsConstants.NAME_MAIL_SENDER, MailParamsConstants.MAIL_SENDER)
+ .addValidate(Validate.newBuilder().setRequired(true).build())
+ .build();
+
+ RadioParam enableSmtpAuth =
+ RadioParam.newBuilder(MailParamsConstants.NAME_MAIL_SMTP_AUTH, MailParamsConstants.MAIL_SMTP_AUTH)
+ .addParamsOptions(new ParamsOptions(STRING_YES, STRING_TRUE, false))
+ .addParamsOptions(new ParamsOptions(STRING_NO, STRING_FALSE, false))
+ .setValue(STRING_TRUE)
+ .addValidate(Validate.newBuilder().setRequired(true).build())
+ .build();
InputParam mailUser = InputParam.newBuilder(MailParamsConstants.NAME_MAIL_USER, MailParamsConstants.MAIL_USER)
- .setPlaceholder("if enable use authentication, you need input user")
- .build();
-
- PasswordParam mailPassword = PasswordParam.newBuilder(MailParamsConstants.NAME_MAIL_PASSWD, MailParamsConstants.MAIL_PASSWD)
- .setPlaceholder("if enable use authentication, you need input password")
- .build();
-
- RadioParam enableTls = RadioParam.newBuilder(MailParamsConstants.NAME_MAIL_SMTP_STARTTLS_ENABLE, MailParamsConstants.MAIL_SMTP_STARTTLS_ENABLE)
- .addParamsOptions(new ParamsOptions(STRING_YES, STRING_TRUE, false))
- .addParamsOptions(new ParamsOptions(STRING_NO, STRING_FALSE, false))
- .setValue(STRING_FALSE)
- .addValidate(Validate.newBuilder().setRequired(true).build())
- .build();
-
- RadioParam enableSsl = RadioParam.newBuilder(MailParamsConstants.NAME_MAIL_SMTP_SSL_ENABLE, MailParamsConstants.MAIL_SMTP_SSL_ENABLE)
- .addParamsOptions(new ParamsOptions(STRING_YES, STRING_TRUE, false))
- .addParamsOptions(new ParamsOptions(STRING_NO, STRING_FALSE, false))
- .setValue(STRING_FALSE)
- .addValidate(Validate.newBuilder().setRequired(true).build())
- .build();
-
- InputParam sslTrust = InputParam.newBuilder(MailParamsConstants.NAME_MAIL_SMTP_SSL_TRUST, MailParamsConstants.MAIL_SMTP_SSL_TRUST)
- .setValue("*")
- .addValidate(Validate.newBuilder().setRequired(true).build())
- .build();
+ .setPlaceholder("if enable use authentication, you need input user")
+ .build();
+
+ PasswordParam mailPassword =
+ PasswordParam.newBuilder(MailParamsConstants.NAME_MAIL_PASSWD, MailParamsConstants.MAIL_PASSWD)
+ .setPlaceholder("if enable use authentication, you need input password")
+ .build();
+
+ RadioParam enableTls = RadioParam
+ .newBuilder(MailParamsConstants.NAME_MAIL_SMTP_STARTTLS_ENABLE,
+ MailParamsConstants.MAIL_SMTP_STARTTLS_ENABLE)
+ .addParamsOptions(new ParamsOptions(STRING_YES, STRING_TRUE, false))
+ .addParamsOptions(new ParamsOptions(STRING_NO, STRING_FALSE, false))
+ .setValue(STRING_FALSE)
+ .addValidate(Validate.newBuilder().setRequired(true).build())
+ .build();
+
+ RadioParam enableSsl = RadioParam
+ .newBuilder(MailParamsConstants.NAME_MAIL_SMTP_SSL_ENABLE, MailParamsConstants.MAIL_SMTP_SSL_ENABLE)
+ .addParamsOptions(new ParamsOptions(STRING_YES, STRING_TRUE, false))
+ .addParamsOptions(new ParamsOptions(STRING_NO, STRING_FALSE, false))
+ .setValue(STRING_FALSE)
+ .addValidate(Validate.newBuilder().setRequired(true).build())
+ .build();
+
+ InputParam sslTrust = InputParam
+ .newBuilder(MailParamsConstants.NAME_MAIL_SMTP_SSL_TRUST, MailParamsConstants.MAIL_SMTP_SSL_TRUST)
+ .setValue("*")
+ .addValidate(Validate.newBuilder().setRequired(true).build())
+ .build();
RadioParam showType = RadioParam.newBuilder(AlertConstants.NAME_SHOW_TYPE, AlertConstants.SHOW_TYPE)
- .addParamsOptions(new ParamsOptions(ShowType.TABLE.getDescp(), ShowType.TABLE.getDescp(), false))
- .addParamsOptions(new ParamsOptions(ShowType.TEXT.getDescp(), ShowType.TEXT.getDescp(), false))
- .addParamsOptions(new ParamsOptions(ShowType.ATTACHMENT.getDescp(), ShowType.ATTACHMENT.getDescp(), false))
- .addParamsOptions(new ParamsOptions(ShowType.TABLE_ATTACHMENT.getDescp(), ShowType.TABLE_ATTACHMENT.getDescp(), false))
- .setValue(ShowType.TABLE.getDescp())
- .addValidate(Validate.newBuilder().setRequired(true).build())
- .build();
+ .addParamsOptions(new ParamsOptions(ShowType.TABLE.getDescp(), ShowType.TABLE.getDescp(), false))
+ .addParamsOptions(new ParamsOptions(ShowType.TEXT.getDescp(), ShowType.TEXT.getDescp(), false))
+ .addParamsOptions(
+ new ParamsOptions(ShowType.ATTACHMENT.getDescp(), ShowType.ATTACHMENT.getDescp(), false))
+ .addParamsOptions(new ParamsOptions(ShowType.TABLE_ATTACHMENT.getDescp(),
+ ShowType.TABLE_ATTACHMENT.getDescp(), false))
+ .setValue(ShowType.TABLE.getDescp())
+ .addValidate(Validate.newBuilder().setRequired(true).build())
+ .build();
paramsList.add(receivesParam);
paramsList.add(receiveCcsParam);
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailConstants.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailConstants.java
index 4c6e1d37ee..94eb4efa39 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailConstants.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/EmailConstants.java
@@ -18,6 +18,7 @@
package org.apache.dolphinscheduler.plugin.alert.email;
public final class EmailConstants {
+
public static final String XLS_FILE_PATH = "xls.file.path";
public static final String MAIL_TRANSPORT_PROTOCOL = "mail.transport.protocol";
@@ -38,19 +39,20 @@ public final class EmailConstants {
public static final String TH_END = "</th>";
- public static final String HTML_HEADER_PREFIX = "<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>"
- + "<html>"
- + "<head>"
- + "<title>dolphinscheduler</title>"
- + "<meta name='Keywords' content=''>"
- + "<meta name='Description' content=''>"
- + "<style type=\"text/css\">"
- + "table {margin-top:0px;padding-top:0px;border:1px solid;font-size: 14px;color: #333333;border-width: 1px;border-color: #666666;border-collapse: collapse;}"
- + "table th {border-width: 1px;padding: 8px;border-style: solid;border-color: #666666;background-color: #dedede;text-align: left;}"
- + "table td {border-width: 1px;padding: 8px;border-style: solid;border-color: #666666;background-color: #ffffff;text-align: left;}"
- + "</style>"
- + "</head>"
- + "<body style=\"margin:0;padding:0\"><table border=\"1px\" cellpadding=\"5px\" cellspacing=\"-10px\"> ";
+ public static final String HTML_HEADER_PREFIX =
+ "<!DOCTYPE HTML PUBLIC '-//W3C//DTD HTML 4.01 Transitional//EN' 'http://www.w3.org/TR/html4/loose.dtd'>"
+ + "<html>"
+ + "<head>"
+ + "<title>dolphinscheduler</title>"
+ + "<meta name='Keywords' content=''>"
+ + "<meta name='Description' content=''>"
+ + "<style type=\"text/css\">"
+ + "table {margin-top:0px;padding-top:0px;border:1px solid;font-size: 14px;color: #333333;border-width: 1px;border-color: #666666;border-collapse: collapse;}"
+ + "table th {border-width: 1px;padding: 8px;border-style: solid;border-color: #666666;background-color: #dedede;text-align: left;}"
+ + "table td {border-width: 1px;padding: 8px;border-style: solid;border-color: #666666;background-color: #ffffff;text-align: left;}"
+ + "</style>"
+ + "</head>"
+ + "<body style=\"margin:0;padding:0\"><table border=\"1px\" cellpadding=\"5px\" cellspacing=\"-10px\"> ";
public static final String TABLE_BODY_HTML_TAIL = "</table></body></html>";
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/ExcelUtils.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/ExcelUtils.java
index 6e02178f19..fbb22cde65 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/ExcelUtils.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/ExcelUtils.java
@@ -39,6 +39,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public final class ExcelUtils {
+
private static final int XLSX_WINDOW_ROW = 10000;
private static final Logger logger = LoggerFactory.getLogger(ExcelUtils.class);
@@ -74,32 +75,33 @@ public final class ExcelUtils {
for (Map.Entry<String, Object> en : headerMap.entrySet()) {
headerList.add(en.getKey());
}
- try (SXSSFWorkbook wb = new SXSSFWorkbook(XLSX_WINDOW_ROW);
- FileOutputStream fos = new FileOutputStream(String.format("%s/%s.xlsx", xlsFilePath, title))) {
+ try (
+ SXSSFWorkbook wb = new SXSSFWorkbook(XLSX_WINDOW_ROW);
+ FileOutputStream fos = new FileOutputStream(String.format("%s/%s.xlsx", xlsFilePath, title))) {
// declare a workbook
// generate a table
Sheet sheet = wb.createSheet();
Row row = sheet.createRow(0);
- //set the height of the first line
+ // set the height of the first line
row.setHeight((short) 500);
- //set Horizontal right
+ // set Horizontal right
CellStyle cellStyle = wb.createCellStyle();
cellStyle.setAlignment(HorizontalAlignment.RIGHT);
- //setting excel headers
+ // setting excel headers
for (int i = 0; i < headerList.size(); i++) {
Cell cell = row.createCell(i);
cell.setCellStyle(cellStyle);
cell.setCellValue(headerList.get(i));
}
- //setting excel body
+ // setting excel body
int rowIndex = 1;
for (LinkedHashMap<String, Object> itemsMap : itemsList) {
Object[] values = itemsMap.values().toArray();
row = sheet.createRow(rowIndex);
- //setting excel body height
+ // setting excel body height
row.setHeight((short) 500);
rowIndex++;
for (int j = 0; j < values.length; j++) {
@@ -117,7 +119,7 @@ public final class ExcelUtils {
sheet.setColumnWidth(i, headerList.get(i).length() * 800);
}
- //setting file output
+ // setting file output
wb.write(fos);
wb.dispose();
} catch (Exception e) {
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/MailParamsConstants.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/MailParamsConstants.java
index bf84fd634d..5fa8c36da3 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/MailParamsConstants.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/MailParamsConstants.java
@@ -18,6 +18,7 @@
package org.apache.dolphinscheduler.plugin.alert.email;
public final class MailParamsConstants {
+
public static final String PLUGIN_DEFAULT_EMAIL_RECEIVERS = "$t('receivers')";
public static final String NAME_PLUGIN_DEFAULT_EMAIL_RECEIVERS = "receivers";
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/MailSender.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/MailSender.java
index a7305cf741..5f805f14ad 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/MailSender.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/MailSender.java
@@ -60,6 +60,7 @@ import org.slf4j.LoggerFactory;
import com.sun.mail.smtp.SMTPProvider;
public final class MailSender {
+
private static final Logger logger = LoggerFactory.getLogger(MailSender.class);
private final List<String> receivers;
@@ -178,7 +179,7 @@ public final class MailSender {
}
if (CollectionUtils.isNotEmpty(receiverCcs)) {
- //cc
+ // cc
for (String receiverCc : receiverCcs) {
email.addCc(receiverCc);
}
@@ -188,12 +189,13 @@ public final class MailSender {
} catch (Exception e) {
handleException(alertResult, e);
}
- } else if (showType.equals(ShowType.ATTACHMENT.getDescp()) || showType.equals(ShowType.TABLE_ATTACHMENT.getDescp())) {
+ } else if (showType.equals(ShowType.ATTACHMENT.getDescp())
+ || showType.equals(ShowType.TABLE_ATTACHMENT.getDescp())) {
try {
String partContent = (showType.equals(ShowType.ATTACHMENT.getDescp())
- ? "Please see the attachment " + title + EmailConstants.EXCEL_SUFFIX_XLSX
- : htmlTable(content, false));
+ ? "Please see the attachment " + title + EmailConstants.EXCEL_SUFFIX_XLSX
+ : htmlTable(content, false));
attachment(title, content, partContent);
@@ -294,6 +296,7 @@ public final class MailSender {
props.setProperty(MailParamsConstants.MAIL_SMTP_SSL_TRUST, sslTrust);
Authenticator auth = new Authenticator() {
+
@Override
protected PasswordAuthentication getPasswordAuthentication() {
// mail username and password
@@ -309,7 +312,8 @@ public final class MailSender {
/**
* attach content
*/
- private void attachContent(String title, String content, String partContent, MimeMessage msg) throws MessagingException, IOException {
+ private void attachContent(String title, String content, String partContent,
+ MimeMessage msg) throws MessagingException, IOException {
/*
* set receiverCc
*/
@@ -329,7 +333,8 @@ public final class MailSender {
MimeBodyPart part2 = new MimeBodyPart();
// add random uuid to filename to avoid potential issue
String randomFilename = title + UUID.randomUUID();
- File file = new File(xlsFilePath + EmailConstants.SINGLE_SLASH + randomFilename + EmailConstants.EXCEL_SUFFIX_XLSX);
+ File file =
+ new File(xlsFilePath + EmailConstants.SINGLE_SLASH + randomFilename + EmailConstants.EXCEL_SUFFIX_XLSX);
if (!file.getParentFile().exists()) {
file.getParentFile().mkdirs();
}
@@ -352,7 +357,8 @@ public final class MailSender {
/**
* the string object map
*/
- private AlertResult getStringObjectMap(String title, String content, AlertResult alertResult, HtmlEmail email) throws EmailException {
+ private AlertResult getStringObjectMap(String title, String content, AlertResult alertResult,
+ HtmlEmail email) throws EmailException {
/*
* the subject of the message to be sent
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/exception/AlertEmailException.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/exception/AlertEmailException.java
index 5b64d8de1e..6b45771692 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/exception/AlertEmailException.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/exception/AlertEmailException.java
@@ -18,6 +18,7 @@
package org.apache.dolphinscheduler.plugin.alert.email.exception;
public class AlertEmailException extends RuntimeException {
+
public AlertEmailException(String errMsg) {
super(errMsg);
}
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/template/DefaultHTMLTemplate.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/template/DefaultHTMLTemplate.java
index 4167e77235..8d2f1ab14e 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/template/DefaultHTMLTemplate.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-email/src/main/java/org/apache/dolphinscheduler/plugin/alert/email/template/DefaultHTMLTemplate.java
@@ -33,15 +33,14 @@ import java.util.Set;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import org.springframework.boot.configurationprocessor.json.JSONArray;
+import org.springframework.boot.configurationprocessor.json.JSONException;
+import org.springframework.boot.configurationprocessor.json.JSONTokener;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.node.ArrayNode;
import com.fasterxml.jackson.databind.node.ObjectNode;
-import org.springframework.boot.configurationprocessor.json.JSONArray;
-import org.springframework.boot.configurationprocessor.json.JSONException;
-import org.springframework.boot.configurationprocessor.json.JSONTokener;
-
public class DefaultHTMLTemplate implements AlertTemplate {
public static final Logger logger = LoggerFactory.getLogger(DefaultHTMLTemplate.class);
@@ -55,7 +54,8 @@ public class DefaultHTMLTemplate implements AlertTemplate {
case TEXT:
return getTextTypeMessage(content);
default:
- throw new IllegalArgumentException(String.format("not support showType: %s in DefaultHTMLTemplate", showType));
+ throw new IllegalArgumentException(
+ String.format("not support showType: %s in DefaultHTMLTemplate", showType));
}
}
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-feishu/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-feishu/pom.xml
index 93450e08f6..1a56cdc094 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-feishu/pom.xml
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-feishu/pom.xml
@@ -15,15 +15,14 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>dolphinscheduler-alert-plugins</artifactId>
<groupId>org.apache.dolphinscheduler</groupId>
+ <artifactId>dolphinscheduler-alert-plugins</artifactId>
<version>dev-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>dolphinscheduler-alert-feishu</artifactId>
<packaging>jar</packaging>
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuAlertChannel.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuAlertChannel.java
index 509eebe615..8959c8aaec 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuAlertChannel.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuAlertChannel.java
@@ -25,6 +25,7 @@ import org.apache.dolphinscheduler.alert.api.AlertResult;
import java.util.Map;
public final class FeiShuAlertChannel implements AlertChannel {
+
@Override
public AlertResult process(AlertInfo alertInfo) {
AlertData alertData = alertInfo.getAlertData();
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuAlertChannelFactory.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuAlertChannelFactory.java
index da78b9f39b..7f6e65ca93 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuAlertChannelFactory.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuAlertChannelFactory.java
@@ -38,6 +38,7 @@ import com.google.auto.service.AutoService;
@AutoService(AlertChannelFactory.class)
public final class FeiShuAlertChannelFactory implements AlertChannelFactory {
+
@Override
public String name() {
return "Feishu";
@@ -45,39 +46,44 @@ public final class FeiShuAlertChannelFactory implements AlertChannelFactory {
@Override
public List<PluginParams> params() {
- InputParam webHookParam = InputParam.newBuilder(FeiShuParamsConstants.NAME_WEB_HOOK, FeiShuParamsConstants.WEB_HOOK)
- .addValidate(Validate.newBuilder()
- .setRequired(true)
- .build())
- .build();
+ InputParam webHookParam =
+ InputParam.newBuilder(FeiShuParamsConstants.NAME_WEB_HOOK, FeiShuParamsConstants.WEB_HOOK)
+ .addValidate(Validate.newBuilder()
+ .setRequired(true)
+ .build())
+ .build();
RadioParam isEnableProxy =
- RadioParam.newBuilder(FeiShuParamsConstants.NAME_FEI_SHU_PROXY_ENABLE, FeiShuParamsConstants.FEI_SHU_PROXY_ENABLE)
- .addParamsOptions(new ParamsOptions(STRING_YES, STRING_TRUE, false))
- .addParamsOptions(new ParamsOptions(STRING_NO, STRING_FALSE, false))
- .setValue(STRING_TRUE)
- .addValidate(Validate.newBuilder()
- .setRequired(false)
- .build())
- .build();
+ RadioParam
+ .newBuilder(FeiShuParamsConstants.NAME_FEI_SHU_PROXY_ENABLE,
+ FeiShuParamsConstants.FEI_SHU_PROXY_ENABLE)
+ .addParamsOptions(new ParamsOptions(STRING_YES, STRING_TRUE, false))
+ .addParamsOptions(new ParamsOptions(STRING_NO, STRING_FALSE, false))
+ .setValue(STRING_TRUE)
+ .addValidate(Validate.newBuilder()
+ .setRequired(false)
+ .build())
+ .build();
InputParam proxyParam =
- InputParam.newBuilder(FeiShuParamsConstants.NAME_FEI_SHU_PROXY, FeiShuParamsConstants.FEI_SHU_PROXY)
- .addValidate(Validate.newBuilder()
- .setRequired(false).build())
- .build();
+ InputParam.newBuilder(FeiShuParamsConstants.NAME_FEI_SHU_PROXY, FeiShuParamsConstants.FEI_SHU_PROXY)
+ .addValidate(Validate.newBuilder()
+ .setRequired(false).build())
+ .build();
- InputParam portParam = InputParam.newBuilder(FeiShuParamsConstants.NAME_FEI_SHU_PORT, FeiShuParamsConstants.FEI_SHU_PORT)
- .addValidate(Validate.newBuilder()
- .setRequired(false).build())
- .build();
+ InputParam portParam =
+ InputParam.newBuilder(FeiShuParamsConstants.NAME_FEI_SHU_PORT, FeiShuParamsConstants.FEI_SHU_PORT)
+ .addValidate(Validate.newBuilder()
+ .setRequired(false).build())
+ .build();
InputParam userParam =
- InputParam.newBuilder(FeiShuParamsConstants.NAME_FEI_SHU_USER, FeiShuParamsConstants.FEI_SHU_USER)
- .addValidate(Validate.newBuilder()
- .setRequired(false).build())
- .build();
- PasswordParam passwordParam = PasswordParam.newBuilder(FeiShuParamsConstants.NAME_FEI_SHU_PASSWORD, FeiShuParamsConstants.FEI_SHU_PASSWORD)
- .setPlaceholder("if enable use authentication, you need input password")
- .build();
+ InputParam.newBuilder(FeiShuParamsConstants.NAME_FEI_SHU_USER, FeiShuParamsConstants.FEI_SHU_USER)
+ .addValidate(Validate.newBuilder()
+ .setRequired(false).build())
+ .build();
+ PasswordParam passwordParam = PasswordParam
+ .newBuilder(FeiShuParamsConstants.NAME_FEI_SHU_PASSWORD, FeiShuParamsConstants.FEI_SHU_PASSWORD)
+ .setPlaceholder("if enable use authentication, you need input password")
+ .build();
return Arrays.asList(webHookParam, isEnableProxy, proxyParam, portParam, userParam, passwordParam);
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuParamsConstants.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuParamsConstants.java
index aa743903e9..0d2c3912f8 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuParamsConstants.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuParamsConstants.java
@@ -18,6 +18,7 @@
package org.apache.dolphinscheduler.plugin.alert.feishu;
public final class FeiShuParamsConstants {
+
public static final String FEI_SHU_PROXY_ENABLE = "$t('isEnableProxy')";
static final String WEB_HOOK = "$t('webhook')";
static final String NAME_WEB_HOOK = "WebHook";
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuSender.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuSender.java
index a5d11c3684..ba245c3ae2 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuSender.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/FeiShuSender.java
@@ -41,6 +41,7 @@ import org.slf4j.LoggerFactory;
import com.fasterxml.jackson.annotation.JsonProperty;
public final class FeiShuSender {
+
private static final Logger logger = LoggerFactory.getLogger(FeiShuSender.class);
private final String url;
private final Boolean enableProxy;
@@ -98,7 +99,8 @@ public final class FeiShuSender {
return alertResult;
}
alertResult.setMessage(String.format("alert send fei shu msg error : %s", sendMsgResponse.getStatusMessage()));
- logger.info("alert send fei shu msg error : {} ,Extra : {} ", sendMsgResponse.getStatusMessage(), sendMsgResponse.getExtra());
+ logger.info("alert send fei shu msg error : {} ,Extra : {} ", sendMsgResponse.getStatusMessage(),
+ sendMsgResponse.getExtra());
return alertResult;
}
@@ -164,7 +166,8 @@ public final class FeiShuSender {
} finally {
response.close();
}
- logger.info("Fei Shu send title :{} ,content :{}, resp: {}", alertData.getTitle(), alertData.getContent(), resp);
+ logger.info("Fei Shu send title :{} ,content :{}, resp: {}", alertData.getTitle(), alertData.getContent(),
+ resp);
return resp;
} finally {
httpClient.close();
@@ -172,6 +175,7 @@ public final class FeiShuSender {
}
static final class FeiShuSendMsgResponse {
+
@JsonProperty("Extra")
private String extra;
@JsonProperty("StatusCode")
@@ -229,7 +233,8 @@ public final class FeiShuSender {
}
final Object this$statusMessage = this.getStatusMessage();
final Object other$statusMessage = other.getStatusMessage();
- if (this$statusMessage == null ? other$statusMessage != null : !this$statusMessage.equals(other$statusMessage)) {
+ if (this$statusMessage == null ? other$statusMessage != null
+ : !this$statusMessage.equals(other$statusMessage)) {
return false;
}
return true;
@@ -248,7 +253,8 @@ public final class FeiShuSender {
}
public String toString() {
- return "FeiShuSender.FeiShuSendMsgResponse(extra=" + this.getExtra() + ", statusCode=" + this.getStatusCode() + ", statusMessage=" + this.getStatusMessage() + ")";
+ return "FeiShuSender.FeiShuSendMsgResponse(extra=" + this.getExtra() + ", statusCode="
+ + this.getStatusCode() + ", statusMessage=" + this.getStatusMessage() + ")";
}
}
}
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/HttpRequestUtil.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/HttpRequestUtil.java
index eca9b07d15..2ba373df08 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/HttpRequestUtil.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-feishu/src/main/java/org/apache/dolphinscheduler/plugin/alert/feishu/HttpRequestUtil.java
@@ -29,11 +29,13 @@ import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
public final class HttpRequestUtil {
+
private HttpRequestUtil() {
throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
}
- public static CloseableHttpClient getHttpClient(boolean enableProxy, String proxy, Integer port, String user, String password) {
+ public static CloseableHttpClient getHttpClient(boolean enableProxy, String proxy, Integer port, String user,
+ String password) {
if (enableProxy) {
HttpHost httpProxy = new HttpHost(proxy, port);
CredentialsProvider provider = new BasicCredentialsProvider();
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-http/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-http/pom.xml
index 007c3cd835..c83356af4d 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-http/pom.xml
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-http/pom.xml
@@ -15,15 +15,14 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>dolphinscheduler-alert-plugins</artifactId>
<groupId>org.apache.dolphinscheduler</groupId>
+ <artifactId>dolphinscheduler-alert-plugins</artifactId>
<version>dev-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>dolphinscheduler-alert-http</artifactId>
<packaging>jar</packaging>
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-http/src/main/java/org/apache/dolphinscheduler/plugin/alert/http/HttpAlertChannel.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-http/src/main/java/org/apache/dolphinscheduler/plugin/alert/http/HttpAlertChannel.java
index 14b416785d..944762f13f 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-http/src/main/java/org/apache/dolphinscheduler/plugin/alert/http/HttpAlertChannel.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-http/src/main/java/org/apache/dolphinscheduler/plugin/alert/http/HttpAlertChannel.java
@@ -25,6 +25,7 @@ import org.apache.dolphinscheduler.alert.api.AlertResult;
import java.util.Map;
public final class HttpAlertChannel implements AlertChannel {
+
@Override
public AlertResult process(AlertInfo alertInfo) {
AlertData alertData = alertInfo.getAlertData();
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-http/src/main/java/org/apache/dolphinscheduler/plugin/alert/http/HttpAlertChannelFactory.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-http/src/main/java/org/apache/dolphinscheduler/plugin/alert/http/HttpAlertChannelFactory.java
index c18ebe4454..0a54b42357 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-http/src/main/java/org/apache/dolphinscheduler/plugin/alert/http/HttpAlertChannelFactory.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-http/src/main/java/org/apache/dolphinscheduler/plugin/alert/http/HttpAlertChannelFactory.java
@@ -30,6 +30,7 @@ import com.google.auto.service.AutoService;
@AutoService(AlertChannelFactory.class)
public final class HttpAlertChannelFactory implements AlertChannelFactory {
+
@Override
public String name() {
return "Http";
@@ -39,39 +40,43 @@ public final class HttpAlertChannelFactory implements AlertChannelFactory {
public List<PluginParams> params() {
InputParam url = InputParam.newBuilder(HttpAlertConstants.NAME_URL, HttpAlertConstants.URL)
- .setPlaceholder("input request URL")
- .addValidate(Validate.newBuilder()
- .setRequired(true)
- .build())
- .build();
+ .setPlaceholder("input request URL")
+ .addValidate(Validate.newBuilder()
+ .setRequired(true)
+ .build())
+ .build();
- InputParam headerParams = InputParam.newBuilder(HttpAlertConstants.NAME_HEADER_PARAMS, HttpAlertConstants.HEADER_PARAMS)
- .setPlaceholder("input request headers as JSON format ")
- .addValidate(Validate.newBuilder()
- .setRequired(true)
- .build())
- .build();
+ InputParam headerParams =
+ InputParam.newBuilder(HttpAlertConstants.NAME_HEADER_PARAMS, HttpAlertConstants.HEADER_PARAMS)
+ .setPlaceholder("input request headers as JSON format ")
+ .addValidate(Validate.newBuilder()
+ .setRequired(true)
+ .build())
+ .build();
- InputParam bodyParams = InputParam.newBuilder(HttpAlertConstants.NAME_BODY_PARAMS, HttpAlertConstants.BODY_PARAMS)
- .setPlaceholder("input request body as JSON format ")
- .addValidate(Validate.newBuilder()
- .setRequired(false)
- .build())
- .build();
+ InputParam bodyParams =
+ InputParam.newBuilder(HttpAlertConstants.NAME_BODY_PARAMS, HttpAlertConstants.BODY_PARAMS)
+ .setPlaceholder("input request body as JSON format ")
+ .addValidate(Validate.newBuilder()
+ .setRequired(false)
+ .build())
+ .build();
- InputParam contentField = InputParam.newBuilder(HttpAlertConstants.NAME_CONTENT_FIELD, HttpAlertConstants.CONTENT_FIELD)
- .setPlaceholder("input alert msg field name")
- .addValidate(Validate.newBuilder()
- .setRequired(true)
- .build())
- .build();
+ InputParam contentField =
+ InputParam.newBuilder(HttpAlertConstants.NAME_CONTENT_FIELD, HttpAlertConstants.CONTENT_FIELD)
+ .setPlaceholder("input alert msg field name")
+ .addValidate(Validate.newBuilder()
+ .setRequired(true)
+ .build())
+ .build();
- InputParam requestType = InputParam.newBuilder(HttpAlertConstants.NAME_REQUEST_TYPE, HttpAlertConstants.REQUEST_TYPE)
- .setPlaceholder("input request type POST or GET")
- .addValidate(Validate.newBuilder()
- .setRequired(true)
- .build())
- .build();
+ InputParam requestType =
+ InputParam.newBuilder(HttpAlertConstants.NAME_REQUEST_TYPE, HttpAlertConstants.REQUEST_TYPE)
+ .setPlaceholder("input request type POST or GET")
+ .addValidate(Validate.newBuilder()
+ .setRequired(true)
+ .build())
+ .build();
return Arrays.asList(url, requestType, headerParams, bodyParams, contentField);
}
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-http/src/main/java/org/apache/dolphinscheduler/plugin/alert/http/HttpAlertConstants.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-http/src/main/java/org/apache/dolphinscheduler/plugin/alert/http/HttpAlertConstants.java
index 6bbf0bfbe0..22db292d5f 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-http/src/main/java/org/apache/dolphinscheduler/plugin/alert/http/HttpAlertConstants.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-http/src/main/java/org/apache/dolphinscheduler/plugin/alert/http/HttpAlertConstants.java
@@ -18,6 +18,7 @@
package org.apache.dolphinscheduler.plugin.alert.http;
public final class HttpAlertConstants {
+
public static final String URL = "$t('url')";
public static final String NAME_URL = "url";
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-pagerduty/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-pagerduty/pom.xml
index 08a664d531..671bff25ea 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-pagerduty/pom.xml
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-pagerduty/pom.xml
@@ -15,15 +15,14 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>dolphinscheduler-alert-plugins</artifactId>
<groupId>org.apache.dolphinscheduler</groupId>
+ <artifactId>dolphinscheduler-alert-plugins</artifactId>
<version>dev-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>dolphinscheduler-alert-pagerduty</artifactId>
<packaging>jar</packaging>
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-pagerduty/src/main/java/org/apache/dolphinscheduler/plugin/alert/pagerduty/PagerDutyAlertChannel.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-pagerduty/src/main/java/org/apache/dolphinscheduler/plugin/alert/pagerduty/PagerDutyAlertChannel.java
index 6ad4c296c1..b033139520 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-pagerduty/src/main/java/org/apache/dolphinscheduler/plugin/alert/pagerduty/PagerDutyAlertChannel.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-pagerduty/src/main/java/org/apache/dolphinscheduler/plugin/alert/pagerduty/PagerDutyAlertChannel.java
@@ -25,6 +25,7 @@ import org.apache.dolphinscheduler.alert.api.AlertResult;
import java.util.Map;
public final class PagerDutyAlertChannel implements AlertChannel {
+
@Override
public AlertResult process(AlertInfo alertInfo) {
AlertData alertData = alertInfo.getAlertData();
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-pagerduty/src/main/java/org/apache/dolphinscheduler/plugin/alert/pagerduty/PagerDutyAlertChannelFactory.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-pagerduty/src/main/java/org/apache/dolphinscheduler/plugin/alert/pagerduty/PagerDutyAlertChannelFactory.java
index 24840f730e..92c42b9d04 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-pagerduty/src/main/java/org/apache/dolphinscheduler/plugin/alert/pagerduty/PagerDutyAlertChannelFactory.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-pagerduty/src/main/java/org/apache/dolphinscheduler/plugin/alert/pagerduty/PagerDutyAlertChannelFactory.java
@@ -17,17 +17,20 @@
package org.apache.dolphinscheduler.plugin.alert.pagerduty;
-import com.google.auto.service.AutoService;
import org.apache.dolphinscheduler.alert.api.AlertChannel;
import org.apache.dolphinscheduler.alert.api.AlertChannelFactory;
import org.apache.dolphinscheduler.spi.params.base.PluginParams;
import org.apache.dolphinscheduler.spi.params.base.Validate;
import org.apache.dolphinscheduler.spi.params.input.InputParam;
+
import java.util.Collections;
import java.util.List;
+import com.google.auto.service.AutoService;
+
@AutoService(AlertChannelFactory.class)
public final class PagerDutyAlertChannelFactory implements AlertChannelFactory {
+
@Override
public String name() {
return "PagerDuty";
@@ -35,7 +38,9 @@ public final class PagerDutyAlertChannelFactory implements AlertChannelFactory {
@Override
public List<PluginParams> params() {
- InputParam integrationKey = InputParam.newBuilder(PagerDutyParamsConstants.NAME_PAGER_DUTY_INTEGRATION_KEY_NAME, PagerDutyParamsConstants.PAGER_DUTY_INTEGRATION_KEY)
+ InputParam integrationKey = InputParam
+ .newBuilder(PagerDutyParamsConstants.NAME_PAGER_DUTY_INTEGRATION_KEY_NAME,
+ PagerDutyParamsConstants.PAGER_DUTY_INTEGRATION_KEY)
.addValidate(Validate.newBuilder()
.setRequired(true)
.build())
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-pagerduty/src/main/java/org/apache/dolphinscheduler/plugin/alert/pagerduty/PagerDutyParamsConstants.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-pagerduty/src/main/java/org/apache/dolphinscheduler/plugin/alert/pagerduty/PagerDutyParamsConstants.java
index a90d302504..bb9ccf6a3e 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-pagerduty/src/main/java/org/apache/dolphinscheduler/plugin/alert/pagerduty/PagerDutyParamsConstants.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-pagerduty/src/main/java/org/apache/dolphinscheduler/plugin/alert/pagerduty/PagerDutyParamsConstants.java
@@ -18,6 +18,7 @@
package org.apache.dolphinscheduler.plugin.alert.pagerduty;
public final class PagerDutyParamsConstants {
+
public static final String NAME_PAGER_DUTY_INTEGRATION_KEY_NAME = "IntegrationKey";
public static final String PAGER_DUTY_INTEGRATION_KEY = "integrationKey";
public static final String PAGER_DUTY_EVENT_ACTION_TRIGGER = "trigger";
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-pagerduty/src/main/java/org/apache/dolphinscheduler/plugin/alert/pagerduty/PagerDutySender.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-pagerduty/src/main/java/org/apache/dolphinscheduler/plugin/alert/pagerduty/PagerDutySender.java
index 3dd0b840c0..5fe11e00a7 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-pagerduty/src/main/java/org/apache/dolphinscheduler/plugin/alert/pagerduty/PagerDutySender.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-pagerduty/src/main/java/org/apache/dolphinscheduler/plugin/alert/pagerduty/PagerDutySender.java
@@ -17,21 +17,29 @@
package org.apache.dolphinscheduler.plugin.alert.pagerduty;
-import com.google.common.base.Preconditions;
import org.apache.dolphinscheduler.alert.api.AlertResult;
import org.apache.dolphinscheduler.spi.utils.JSONUtils;
+
import org.apache.http.HttpStatus;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpPost;
import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
-import org.slf4j.Logger;
+
import java.io.IOException;
import java.nio.charset.StandardCharsets;
-import java.util.*;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
+import org.slf4j.Logger;
+
+import com.google.common.base.Preconditions;
public final class PagerDutySender {
+
private static final Logger log = org.slf4j.LoggerFactory.getLogger(PagerDutySender.class);
private final String integrationKey;
@@ -41,7 +49,7 @@ public final class PagerDutySender {
Preconditions.checkArgument(!Objects.isNull(integrationKey), "PagerDuty integration key can not be null");
}
- public AlertResult sendPagerDutyAlter(String title, String content){
+ public AlertResult sendPagerDutyAlter(String title, String content) {
AlertResult alertResult = new AlertResult();
alertResult.setStatus("false");
alertResult.setMessage("send pager duty alert fail.");
@@ -72,10 +80,10 @@ public final class PagerDutySender {
if (statusCode == HttpStatus.SC_OK || statusCode == HttpStatus.SC_ACCEPTED) {
alertResult.setStatus("true");
alertResult.setMessage("send pager duty alert success");
- }else {
+ } else {
log.info("send pager duty alert fail, statusCode : {}", statusCode);
}
- }finally {
+ } finally {
response.close();
}
} catch (IOException e) {
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/pom.xml
index 96038b970c..e5b168d543 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/pom.xml
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/pom.xml
@@ -15,15 +15,14 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>dolphinscheduler-alert-plugins</artifactId>
<groupId>org.apache.dolphinscheduler</groupId>
+ <artifactId>dolphinscheduler-alert-plugins</artifactId>
<version>dev-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>dolphinscheduler-alert-script</artifactId>
<packaging>jar</packaging>
</project>
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/OSUtils.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/OSUtils.java
index 51e567b47e..ef5fcf67d2 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/OSUtils.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/OSUtils.java
@@ -18,6 +18,7 @@
package org.apache.dolphinscheduler.plugin.alert.script;
public final class OSUtils {
+
private OSUtils() {
throw new UnsupportedOperationException("This is a utility class and cannot be instantiated");
}
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ProcessUtils.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ProcessUtils.java
index 0bc0a121d6..6ea9a8db92 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ProcessUtils.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ProcessUtils.java
@@ -23,6 +23,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public final class ProcessUtils {
+
private static final Logger logger = LoggerFactory.getLogger(ProcessUtils.class);
private ProcessUtils() {
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptAlertChannel.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptAlertChannel.java
index bd52955b74..3d865c6dc0 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptAlertChannel.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptAlertChannel.java
@@ -25,6 +25,7 @@ import org.apache.dolphinscheduler.alert.api.AlertResult;
import java.util.Map;
public final class ScriptAlertChannel implements AlertChannel {
+
@Override
public AlertResult process(AlertInfo alertinfo) {
AlertData alertData = alertinfo.getAlertData();
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptAlertChannelFactory.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptAlertChannelFactory.java
index aacde95ba1..294bca04fd 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptAlertChannelFactory.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptAlertChannelFactory.java
@@ -32,6 +32,7 @@ import com.google.auto.service.AutoService;
@AutoService(AlertChannelFactory.class)
public final class ScriptAlertChannelFactory implements AlertChannelFactory {
+
@Override
public String name() {
return "Script";
@@ -40,26 +41,30 @@ public final class ScriptAlertChannelFactory implements AlertChannelFactory {
@Override
public List<PluginParams> params() {
- InputParam scriptUserParam = InputParam.newBuilder(ScriptParamsConstants.NAME_SCRIPT_USER_PARAMS, ScriptParamsConstants.SCRIPT_USER_PARAMS)
- .addValidate(Validate.newBuilder()
- .setRequired(false)
- .build())
- .setPlaceholder("please enter your custom parameters, which will be passed to you when calling your script")
- .build();
+ InputParam scriptUserParam = InputParam
+ .newBuilder(ScriptParamsConstants.NAME_SCRIPT_USER_PARAMS, ScriptParamsConstants.SCRIPT_USER_PARAMS)
+ .addValidate(Validate.newBuilder()
+ .setRequired(false)
+ .build())
+ .setPlaceholder(
+ "please enter your custom parameters, which will be passed to you when calling your script")
+ .build();
// need check file type and file exist
- InputParam scriptPathParam = InputParam.newBuilder(ScriptParamsConstants.NAME_SCRIPT_PATH, ScriptParamsConstants.SCRIPT_PATH)
- .addValidate(Validate.newBuilder()
- .setRequired(true)
- .build())
- .setPlaceholder("please upload the file to the disk directory of the alert server,"
- + " and ensure that the path is absolute and has the corresponding access rights")
- .build();
+ InputParam scriptPathParam =
+ InputParam.newBuilder(ScriptParamsConstants.NAME_SCRIPT_PATH, ScriptParamsConstants.SCRIPT_PATH)
+ .addValidate(Validate.newBuilder()
+ .setRequired(true)
+ .build())
+ .setPlaceholder("please upload the file to the disk directory of the alert server,"
+ + " and ensure that the path is absolute and has the corresponding access rights")
+ .build();
- RadioParam scriptTypeParams = RadioParam.newBuilder(ScriptParamsConstants.NAME_SCRIPT_TYPE, ScriptParamsConstants.SCRIPT_TYPE)
- .addParamsOptions(new ParamsOptions(ScriptType.SHELL.getDescp(), ScriptType.SHELL.getDescp(), false))
- .setValue(ScriptType.SHELL.getDescp())
- .addValidate(Validate.newBuilder().setRequired(true).build())
- .build();
+ RadioParam scriptTypeParams = RadioParam
+ .newBuilder(ScriptParamsConstants.NAME_SCRIPT_TYPE, ScriptParamsConstants.SCRIPT_TYPE)
+ .addParamsOptions(new ParamsOptions(ScriptType.SHELL.getDescp(), ScriptType.SHELL.getDescp(), false))
+ .setValue(ScriptType.SHELL.getDescp())
+ .addValidate(Validate.newBuilder().setRequired(true).build())
+ .build();
return Arrays.asList(scriptUserParam, scriptPathParam, scriptTypeParams);
}
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptParamsConstants.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptParamsConstants.java
index e680903fb2..1c759525b3 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptParamsConstants.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptParamsConstants.java
@@ -18,6 +18,7 @@
package org.apache.dolphinscheduler.plugin.alert.script;
public final class ScriptParamsConstants {
+
static final String SCRIPT_TYPE = "$t('scriptType')";
static final String NAME_SCRIPT_TYPE = "type";
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptType.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptType.java
index cbb3e11f28..b31e10f575 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptType.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptType.java
@@ -18,6 +18,7 @@
package org.apache.dolphinscheduler.plugin.alert.script;
public enum ScriptType {
+
SHELL(0, "SHELL"),
;
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/StreamGobbler.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/StreamGobbler.java
index 208791b6f2..e2765a8a40 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/StreamGobbler.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/StreamGobbler.java
@@ -26,6 +26,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
public final class StreamGobbler extends Thread {
+
private static final Logger logger = LoggerFactory.getLogger(StreamGobbler.class);
private final InputStream inputStream;
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-slack/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-slack/pom.xml
index 256b1ebd67..e92ddc6a42 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-slack/pom.xml
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-slack/pom.xml
@@ -15,15 +15,14 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>dolphinscheduler-alert-plugins</artifactId>
<groupId>org.apache.dolphinscheduler</groupId>
+ <artifactId>dolphinscheduler-alert-plugins</artifactId>
<version>dev-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>dolphinscheduler-alert-slack</artifactId>
<packaging>jar</packaging>
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-slack/src/main/java/org/apache/dolphinscheduler/plugin/alert/slack/SlackAlertChannel.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-slack/src/main/java/org/apache/dolphinscheduler/plugin/alert/slack/SlackAlertChannel.java
index b63fed0574..c8cb36a78b 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-slack/src/main/java/org/apache/dolphinscheduler/plugin/alert/slack/SlackAlertChannel.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-slack/src/main/java/org/apache/dolphinscheduler/plugin/alert/slack/SlackAlertChannel.java
@@ -25,6 +25,7 @@ import org.apache.dolphinscheduler.alert.api.AlertResult;
import java.util.Map;
public final class SlackAlertChannel implements AlertChannel {
+
@Override
public AlertResult process(AlertInfo alertInfo) {
AlertData alertData = alertInfo.getAlertData();
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-slack/src/main/java/org/apache/dolphinscheduler/plugin/alert/slack/SlackAlertChannelFactory.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-slack/src/main/java/org/apache/dolphinscheduler/plugin/alert/slack/SlackAlertChannelFactory.java
index f86e32933f..e08bc4618e 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-slack/src/main/java/org/apache/dolphinscheduler/plugin/alert/slack/SlackAlertChannelFactory.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-slack/src/main/java/org/apache/dolphinscheduler/plugin/alert/slack/SlackAlertChannelFactory.java
@@ -30,6 +30,7 @@ import com.google.auto.service.AutoService;
@AutoService(AlertChannelFactory.class)
public final class SlackAlertChannelFactory implements AlertChannelFactory {
+
@Override
public String name() {
return "Slack";
@@ -39,19 +40,20 @@ public final class SlackAlertChannelFactory implements AlertChannelFactory {
public List<PluginParams> params() {
List<PluginParams> paramsList = new LinkedList<>();
- InputParam webHookParam = InputParam.newBuilder(SlackParamsConstants.SLACK_WEB_HOOK_URL_NAME, SlackParamsConstants.SLACK_WEB_HOOK_URL)
- .addValidate(Validate.newBuilder()
- .setRequired(true)
- .build())
- .setPlaceholder("Input WebHook Url")
- .build();
+ InputParam webHookParam = InputParam
+ .newBuilder(SlackParamsConstants.SLACK_WEB_HOOK_URL_NAME, SlackParamsConstants.SLACK_WEB_HOOK_URL)
+ .addValidate(Validate.newBuilder()
+ .setRequired(true)
+ .build())
+ .setPlaceholder("Input WebHook Url")
+ .build();
InputParam botName = InputParam.newBuilder(SlackParamsConstants.SLACK_BOT_NAME, SlackParamsConstants.SLACK_BOT)
- .addValidate(Validate.newBuilder()
- .setRequired(true)
- .build())
- .setPlaceholder("Input the bot username")
- .build();
+ .addValidate(Validate.newBuilder()
+ .setRequired(true)
+ .build())
+ .setPlaceholder("Input the bot username")
+ .build();
paramsList.add(webHookParam);
paramsList.add(botName);
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-slack/src/main/java/org/apache/dolphinscheduler/plugin/alert/slack/SlackParamsConstants.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-slack/src/main/java/org/apache/dolphinscheduler/plugin/alert/slack/SlackParamsConstants.java
index a3c9f19ac5..c92f303155 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-slack/src/main/java/org/apache/dolphinscheduler/plugin/alert/slack/SlackParamsConstants.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-slack/src/main/java/org/apache/dolphinscheduler/plugin/alert/slack/SlackParamsConstants.java
@@ -18,6 +18,7 @@
package org.apache.dolphinscheduler.plugin.alert.slack;
public final class SlackParamsConstants {
+
public static final String SLACK_WEB_HOOK_URL = "$t('webhook')";
public static final String SLACK_WEB_HOOK_URL_NAME = "webHook";
public static final String SLACK_BOT = "$t('Username')";
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-slack/src/main/java/org/apache/dolphinscheduler/plugin/alert/slack/SlackSender.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-slack/src/main/java/org/apache/dolphinscheduler/plugin/alert/slack/SlackSender.java
index 1017c839fd..e571642f38 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-slack/src/main/java/org/apache/dolphinscheduler/plugin/alert/slack/SlackSender.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-slack/src/main/java/org/apache/dolphinscheduler/plugin/alert/slack/SlackSender.java
@@ -44,6 +44,7 @@ import org.slf4j.LoggerFactory;
import com.google.common.base.Preconditions;
public final class SlackSender {
+
private static final Logger logger = LoggerFactory.getLogger(SlackSender.class);
private final String webHookUrl;
@@ -53,7 +54,8 @@ public final class SlackSender {
webHookUrl = slackAlertParam.get(SlackParamsConstants.SLACK_WEB_HOOK_URL_NAME);
botName = slackAlertParam.get(SlackParamsConstants.SLACK_BOT_NAME);
Preconditions.checkArgument(!Objects.isNull(webHookUrl), "SlackWebHookURL can not be null");
- Preconditions.checkArgument(webHookUrl.startsWith("https://hooks.slack.com/services/"), "SlackWebHookURL invalidate");
+ Preconditions.checkArgument(webHookUrl.startsWith("https://hooks.slack.com/services/"),
+ "SlackWebHookURL invalidate");
Preconditions.checkArgument(!Objects.isNull(botName), "slack bot name can not be null");
}
@@ -120,17 +122,17 @@ public final class SlackSender {
final int elementLen = maxLen;
StringBuilder stringBuilder = new StringBuilder(200);
stringBuilder.append(headers.stream()
- .map(header -> generateString(header, elementLen, " "))
- .collect(Collectors.joining("|")));
+ .map(header -> generateString(header, elementLen, " "))
+ .collect(Collectors.joining("|")));
stringBuilder.append("\n");
for (List<String> element : elements) {
stringBuilder.append(element.stream()
- .map(lement -> generateString("", elementLen, "-"))
- .collect(Collectors.joining("|")));
+ .map(lement -> generateString("", elementLen, "-"))
+ .collect(Collectors.joining("|")));
stringBuilder.append("\n");
stringBuilder.append(element.stream()
- .map(e -> generateString(e, elementLen, " "))
- .collect(Collectors.joining("|")));
+ .map(e -> generateString(e, elementLen, " "))
+ .collect(Collectors.joining("|")));
stringBuilder.append("\n");
}
return String.format("```%s```", stringBuilder);
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-telegram/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-telegram/pom.xml
index ed761d446a..e24045c8aa 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-telegram/pom.xml
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-telegram/pom.xml
@@ -15,15 +15,14 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>dolphinscheduler-alert-plugins</artifactId>
<groupId>org.apache.dolphinscheduler</groupId>
+ <artifactId>dolphinscheduler-alert-plugins</artifactId>
<version>dev-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>dolphinscheduler-alert-telegram</artifactId>
<packaging>jar</packaging>
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-telegram/src/main/java/org/apache/dolphinscheduler/plugin/alert/telegram/TelegramAlertChannel.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-telegram/src/main/java/org/apache/dolphinscheduler/plugin/alert/telegram/TelegramAlertChannel.java
index 26db453dd4..efc8912d1a 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-telegram/src/main/java/org/apache/dolphinscheduler/plugin/alert/telegram/TelegramAlertChannel.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-telegram/src/main/java/org/apache/dolphinscheduler/plugin/alert/telegram/TelegramAlertChannel.java
@@ -25,6 +25,7 @@ import org.apache.dolphinscheduler.alert.api.AlertResult;
import java.util.Map;
public final class TelegramAlertChannel implements AlertChannel {
+
@Override
public AlertResult process(AlertInfo info) {
Map<String, String> alertParams = info.getAlertParams();
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-telegram/src/main/java/org/apache/dolphinscheduler/plugin/alert/telegram/TelegramAlertChannelFactory.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-telegram/src/main/java/org/apache/dolphinscheduler/plugin/alert/telegram/TelegramAlertChannelFactory.java
index f282cb5153..240578cfb7 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-telegram/src/main/java/org/apache/dolphinscheduler/plugin/alert/telegram/TelegramAlertChannelFactory.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-telegram/src/main/java/org/apache/dolphinscheduler/plugin/alert/telegram/TelegramAlertChannelFactory.java
@@ -17,7 +17,11 @@
package org.apache.dolphinscheduler.plugin.alert.telegram;
-import com.google.auto.service.AutoService;
+import static org.apache.dolphinscheduler.spi.utils.Constants.STRING_FALSE;
+import static org.apache.dolphinscheduler.spi.utils.Constants.STRING_NO;
+import static org.apache.dolphinscheduler.spi.utils.Constants.STRING_TRUE;
+import static org.apache.dolphinscheduler.spi.utils.Constants.STRING_YES;
+
import org.apache.dolphinscheduler.alert.api.AlertChannel;
import org.apache.dolphinscheduler.alert.api.AlertChannelFactory;
import org.apache.dolphinscheduler.spi.params.PasswordParam;
@@ -31,7 +35,7 @@ import org.apache.dolphinscheduler.spi.params.select.SelectParam;
import java.util.Arrays;
import java.util.List;
-import static org.apache.dolphinscheduler.spi.utils.Constants.*;
+import com.google.auto.service.AutoService;
@AutoService(AlertChannelFactory.class)
public final class TelegramAlertChannelFactory implements AlertChannelFactory {
@@ -49,40 +53,50 @@ public final class TelegramAlertChannelFactory implements AlertChannelFactory {
@Override
public List<PluginParams> params() {
-
- InputParam webHookParam = InputParam.newBuilder(TelegramParamsConstants.NAME_TELEGRAM_WEB_HOOK, TelegramParamsConstants.TELEGRAM_WEB_HOOK)
+ InputParam webHookParam = InputParam
+ .newBuilder(TelegramParamsConstants.NAME_TELEGRAM_WEB_HOOK, TelegramParamsConstants.TELEGRAM_WEB_HOOK)
.addValidate(Validate.newBuilder()
.setRequired(true)
.build())
.setPlaceholder("telegram web hook")
.build();
- InputParam botTokenParam = InputParam.newBuilder(TelegramParamsConstants.NAME_TELEGRAM_BOT_TOKEN, TelegramParamsConstants.TELEGRAM_BOT_TOKEN)
+ InputParam botTokenParam = InputParam
+ .newBuilder(TelegramParamsConstants.NAME_TELEGRAM_BOT_TOKEN, TelegramParamsConstants.TELEGRAM_BOT_TOKEN)
.addValidate(Validate.newBuilder()
.setRequired(true)
.build())
.setPlaceholder("telegram bot token")
.build();
- InputParam chatIdParam = InputParam.newBuilder(TelegramParamsConstants.NAME_TELEGRAM_CHAT_ID, TelegramParamsConstants.TELEGRAM_CHAT_ID)
+ InputParam chatIdParam = InputParam
+ .newBuilder(TelegramParamsConstants.NAME_TELEGRAM_CHAT_ID, TelegramParamsConstants.TELEGRAM_CHAT_ID)
.addValidate(Validate.newBuilder()
.setRequired(true)
.build())
.setPlaceholder("telegram channel chat id")
.build();
- SelectParam parseMode = SelectParam.newBuilder(TelegramParamsConstants.NAME_TELEGRAM_PARSE_MODE, TelegramParamsConstants.TELEGRAM_PARSE_MODE)
- .addOptions(new ParamsOptions(TelegramAlertConstants.PARSE_MODE_TXT, TelegramAlertConstants.PARSE_MODE_TXT, false))
- .addOptions(new ParamsOptions(TelegramAlertConstants.PARSE_MODE_MARKDOWN, TelegramAlertConstants.PARSE_MODE_MARKDOWN, false))
- .addOptions(new ParamsOptions(TelegramAlertConstants.PARSE_MODE_MARKDOWN_V2, TelegramAlertConstants.PARSE_MODE_MARKDOWN_V2, false))
- .addOptions(new ParamsOptions(TelegramAlertConstants.PARSE_MODE_HTML, TelegramAlertConstants.PARSE_MODE_HTML, false))
+ SelectParam parseMode = SelectParam
+ .newBuilder(TelegramParamsConstants.NAME_TELEGRAM_PARSE_MODE,
+ TelegramParamsConstants.TELEGRAM_PARSE_MODE)
+ .addOptions(new ParamsOptions(TelegramAlertConstants.PARSE_MODE_TXT,
+ TelegramAlertConstants.PARSE_MODE_TXT, false))
+ .addOptions(new ParamsOptions(TelegramAlertConstants.PARSE_MODE_MARKDOWN,
+ TelegramAlertConstants.PARSE_MODE_MARKDOWN, false))
+ .addOptions(new ParamsOptions(TelegramAlertConstants.PARSE_MODE_MARKDOWN_V2,
+ TelegramAlertConstants.PARSE_MODE_MARKDOWN_V2, false))
+ .addOptions(new ParamsOptions(TelegramAlertConstants.PARSE_MODE_HTML,
+ TelegramAlertConstants.PARSE_MODE_HTML, false))
.setValue(TelegramAlertConstants.PARSE_MODE_TXT)
.addValidate(Validate.newBuilder()
.setRequired(true)
.build())
.build();
- RadioParam isEnableProxy = RadioParam.newBuilder(TelegramParamsConstants.NAME_TELEGRAM_PROXY_ENABLE, TelegramParamsConstants.TELEGRAM_PROXY_ENABLE)
+ RadioParam isEnableProxy = RadioParam
+ .newBuilder(TelegramParamsConstants.NAME_TELEGRAM_PROXY_ENABLE,
+ TelegramParamsConstants.TELEGRAM_PROXY_ENABLE)
.addParamsOptions(new ParamsOptions(STRING_YES, STRING_TRUE, false))
.addParamsOptions(new ParamsOptions(STRING_NO, STRING_FALSE, false))
.setValue(STRING_FALSE)
@@ -91,33 +105,37 @@ public final class TelegramAlertChannelFactory implements AlertChannelFactory {
.build())
.build();
- InputParam proxyParam = InputParam.newBuilder(TelegramParamsConstants.NAME_TELEGRAM_PROXY, TelegramParamsConstants.TELEGRAM_PROXY)
+ InputParam proxyParam = InputParam
+ .newBuilder(TelegramParamsConstants.NAME_TELEGRAM_PROXY, TelegramParamsConstants.TELEGRAM_PROXY)
.addValidate(Validate.newBuilder()
.setRequired(false)
.build())
.build();
- InputParam portParam = InputParam.newBuilder(TelegramParamsConstants.NAME_TELEGRAM_PORT, TelegramParamsConstants.TELEGRAM_PORT)
- .addValidate(Validate.newBuilder()
- .setRequired(false)
- .build())
- .build();
-
- InputParam userParam = InputParam.newBuilder(TelegramParamsConstants.NAME_TELEGRAM_USER, TelegramParamsConstants.TELEGRAM_USER)
- .addValidate(Validate.newBuilder()
- .setRequired(false)
- .build())
- .build();
-
- PasswordParam passwordParam = PasswordParam.newBuilder(TelegramParamsConstants.NAME_TELEGRAM_PASSWORD, TelegramParamsConstants.TELEGRAM_PASSWORD)
+ InputParam portParam =
+ InputParam.newBuilder(TelegramParamsConstants.NAME_TELEGRAM_PORT, TelegramParamsConstants.TELEGRAM_PORT)
+ .addValidate(Validate.newBuilder()
+ .setRequired(false)
+ .build())
+ .build();
+
+ InputParam userParam =
+ InputParam.newBuilder(TelegramParamsConstants.NAME_TELEGRAM_USER, TelegramParamsConstants.TELEGRAM_USER)
+ .addValidate(Validate.newBuilder()
+ .setRequired(false)
+ .build())
+ .build();
+
+ PasswordParam passwordParam = PasswordParam
+ .newBuilder(TelegramParamsConstants.NAME_TELEGRAM_PASSWORD, TelegramParamsConstants.TELEGRAM_PASSWORD)
.addValidate(Validate.newBuilder()
.setRequired(false)
.build())
.setPlaceholder("if enable use authentication, you need input password")
.build();
- return Arrays.asList(webHookParam, botTokenParam, chatIdParam, parseMode, isEnableProxy, proxyParam, portParam, userParam, passwordParam);
+ return Arrays.asList(webHookParam, botTokenParam, chatIdParam, parseMode, isEnableProxy, proxyParam, portParam,
+ userParam, passwordParam);
}
-
}
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-telegram/src/main/java/org/apache/dolphinscheduler/plugin/alert/telegram/TelegramParamsConstants.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-telegram/src/main/java/org/apache/dolphinscheduler/plugin/alert/telegram/TelegramParamsConstants.java
index d9fbb3f218..4ae48506c4 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-telegram/src/main/java/org/apache/dolphinscheduler/plugin/alert/telegram/TelegramParamsConstants.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-telegram/src/main/java/org/apache/dolphinscheduler/plugin/alert/telegram/TelegramParamsConstants.java
@@ -17,7 +17,6 @@
package org.apache.dolphinscheduler.plugin.alert.telegram;
-
public final class TelegramParamsConstants {
static final String TELEGRAM_WEB_HOOK = "$t('webHook')";
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-telegram/src/main/java/org/apache/dolphinscheduler/plugin/alert/telegram/TelegramSender.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-telegram/src/main/java/org/apache/dolphinscheduler/plugin/alert/telegram/TelegramSender.java
index 2472e81a40..eb7d7bfa3c 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-telegram/src/main/java/org/apache/dolphinscheduler/plugin/alert/telegram/TelegramSender.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-telegram/src/main/java/org/apache/dolphinscheduler/plugin/alert/telegram/TelegramSender.java
@@ -17,11 +17,11 @@
package org.apache.dolphinscheduler.plugin.alert.telegram;
-import com.fasterxml.jackson.annotation.JsonProperty;
import org.apache.dolphinscheduler.alert.api.AlertData;
import org.apache.dolphinscheduler.alert.api.AlertResult;
import org.apache.dolphinscheduler.spi.utils.JSONUtils;
import org.apache.dolphinscheduler.spi.utils.StringUtils;
+
import org.apache.http.HttpEntity;
import org.apache.http.HttpHeaders;
import org.apache.http.HttpHost;
@@ -37,14 +37,17 @@ import org.apache.http.impl.client.BasicCredentialsProvider;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.nio.charset.StandardCharsets;
import java.util.HashMap;
import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
public final class TelegramSender {
private static final Logger logger = LoggerFactory.getLogger(TelegramSender.class);
@@ -69,7 +72,6 @@ public final class TelegramSender {
private String password;
-
TelegramSender(Map<String, String> config) {
url = config.get(TelegramParamsConstants.NAME_TELEGRAM_WEB_HOOK);
botToken = config.get(TelegramParamsConstants.NAME_TELEGRAM_BOT_TOKEN);
@@ -132,14 +134,13 @@ public final class TelegramSender {
return result;
}
-
private String sendInvoke(String title, String content) throws IOException {
HttpPost httpPost = buildHttpPost(url, buildMsgJsonStr(content));
CloseableHttpClient httpClient;
if (Boolean.TRUE.equals(enableProxy)) {
if (StringUtils.isNotEmpty(user) && StringUtils.isNotEmpty(password)) {
httpClient = getProxyClient(proxy, port, user, password);
- }else {
+ } else {
httpClient = getDefaultClient();
}
RequestConfig rcf = getProxyConfig(proxy, port);
@@ -180,6 +181,7 @@ public final class TelegramSender {
}
static class TelegramSendMsgResponse {
+
@JsonProperty("ok")
private Boolean ok;
@JsonProperty("error_code")
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-webexteams/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-webexteams/pom.xml
index 5668088eb7..fc1c373bee 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-webexteams/pom.xml
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-webexteams/pom.xml
@@ -15,15 +15,14 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>dolphinscheduler-alert-plugins</artifactId>
<groupId>org.apache.dolphinscheduler</groupId>
+ <artifactId>dolphinscheduler-alert-plugins</artifactId>
<version>dev-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>dolphinscheduler-alert-webexteams</artifactId>
<packaging>jar</packaging>
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-webexteams/src/main/java/org/apache/dolphinscheduler/plugin/alert/webexteams/WebexMessage.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-webexteams/src/main/java/org/apache/dolphinscheduler/plugin/alert/webexteams/WebexMessage.java
index f1b908ff6c..4a417909e4 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-webexteams/src/main/java/org/apache/dolphinscheduler/plugin/alert/webexteams/WebexMessage.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-webexteams/src/main/java/org/apache/dolphinscheduler/plugin/alert/webexteams/WebexMessage.java
@@ -18,6 +18,7 @@
package org.apache.dolphinscheduler.plugin.alert.webexteams;
public class WebexMessage {
+
private String roomId;
private String toPersonId;
private String toPersonEmail;
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-webexteams/src/main/java/org/apache/dolphinscheduler/plugin/alert/webexteams/WebexTeamsAlertChannel.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-webexteams/src/main/java/org/apache/dolphinscheduler/plugin/alert/webexteams/WebexTeamsAlertChannel.java
index 08963cab6a..1a799ae50c 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-webexteams/src/main/java/org/apache/dolphinscheduler/plugin/alert/webexteams/WebexTeamsAlertChannel.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-webexteams/src/main/java/org/apache/dolphinscheduler/plugin/alert/webexteams/WebexTeamsAlertChannel.java
@@ -25,6 +25,7 @@ import org.apache.dolphinscheduler.alert.api.AlertResult;
import java.util.Map;
public final class WebexTeamsAlertChannel implements AlertChannel {
+
@Override
public AlertResult process(AlertInfo alertInfo) {
AlertData alertData = alertInfo.getAlertData();
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-webexteams/src/main/java/org/apache/dolphinscheduler/plugin/alert/webexteams/WebexTeamsAlertChannelFactory.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-webexteams/src/main/java/org/apache/dolphinscheduler/plugin/alert/webexteams/WebexTeamsAlertChannelFactory.java
index f17c3cde8f..e11078a31c 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-webexteams/src/main/java/org/apache/dolphinscheduler/plugin/alert/webexteams/WebexTeamsAlertChannelFactory.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-webexteams/src/main/java/org/apache/dolphinscheduler/plugin/alert/webexteams/WebexTeamsAlertChannelFactory.java
@@ -32,6 +32,7 @@ import com.google.auto.service.AutoService;
@AutoService(AlertChannelFactory.class)
public final class WebexTeamsAlertChannelFactory implements AlertChannelFactory {
+
@Override
public String name() {
return "WebexTeams";
@@ -40,48 +41,63 @@ public final class WebexTeamsAlertChannelFactory implements AlertChannelFactory
@Override
public List<PluginParams> params() {
List<PluginParams> paramsList = new ArrayList<>();
- InputParam botAccessToken = InputParam.newBuilder(WebexTeamsParamsConstants.NAME_WEBEX_TEAMS_BOT_ACCESS_TOKEN, WebexTeamsParamsConstants.WEBEX_TEAMS_BOT_ACCESS_TOKEN)
- .setPlaceholder("Please enter the robot's access token you were given")
- .addValidate(Validate.newBuilder()
- .setRequired(true)
- .build())
- .build();
+ InputParam botAccessToken = InputParam
+ .newBuilder(WebexTeamsParamsConstants.NAME_WEBEX_TEAMS_BOT_ACCESS_TOKEN,
+ WebexTeamsParamsConstants.WEBEX_TEAMS_BOT_ACCESS_TOKEN)
+ .setPlaceholder("Please enter the robot's access token you were given")
+ .addValidate(Validate.newBuilder()
+ .setRequired(true)
+ .build())
+ .build();
- InputParam roomId = InputParam.newBuilder(WebexTeamsParamsConstants.NAME_WEBEX_TEAMS_ROOM_ID, WebexTeamsParamsConstants.WEBEX_TEAMS_ROOM_ID)
- .setPlaceholder("The room ID of the message")
- .addValidate(Validate.newBuilder()
- .setRequired(false)
- .build())
- .build();
+ InputParam roomId = InputParam
+ .newBuilder(WebexTeamsParamsConstants.NAME_WEBEX_TEAMS_ROOM_ID,
+ WebexTeamsParamsConstants.WEBEX_TEAMS_ROOM_ID)
+ .setPlaceholder("The room ID of the message")
+ .addValidate(Validate.newBuilder()
+ .setRequired(false)
+ .build())
+ .build();
- InputParam toPersonId = InputParam.newBuilder(WebexTeamsParamsConstants.NAME_WEBEX_TEAMS_TO_PERSON_ID, WebexTeamsParamsConstants.WEBEX_TEAMS_TO_PERSON_ID)
- .setPlaceholder("The person ID of the message recipient")
- .addValidate(Validate.newBuilder()
- .setRequired(false)
- .build())
- .build();
+ InputParam toPersonId = InputParam
+ .newBuilder(WebexTeamsParamsConstants.NAME_WEBEX_TEAMS_TO_PERSON_ID,
+ WebexTeamsParamsConstants.WEBEX_TEAMS_TO_PERSON_ID)
+ .setPlaceholder("The person ID of the message recipient")
+ .addValidate(Validate.newBuilder()
+ .setRequired(false)
+ .build())
+ .build();
- InputParam toPersonEmail = InputParam.newBuilder(WebexTeamsParamsConstants.NAME_WEBEX_TEAMS_TO_PERSON_EMAIL, WebexTeamsParamsConstants.WEBEX_TEAMS_TO_PERSON_EMAIL)
- .setPlaceholder("The email address of the message recipient")
- .addValidate(Validate.newBuilder()
- .setRequired(false)
- .build())
- .build();
+ InputParam toPersonEmail = InputParam
+ .newBuilder(WebexTeamsParamsConstants.NAME_WEBEX_TEAMS_TO_PERSON_EMAIL,
+ WebexTeamsParamsConstants.WEBEX_TEAMS_TO_PERSON_EMAIL)
+ .setPlaceholder("The email address of the message recipient")
+ .addValidate(Validate.newBuilder()
+ .setRequired(false)
+ .build())
+ .build();
- InputParam atSomeoneInRoom = InputParam.newBuilder(WebexTeamsParamsConstants.NAME_WEBEX_TEAMS_AT_SOMEONE_IN_ROOM, WebexTeamsParamsConstants.WEBEX_TEAMS_AT_SOMEONE_IN_ROOM)
- .setPlaceholder("use ,(eng commas) to separate multiple emails")
- .addValidate(Validate.newBuilder()
- .setRequired(false)
- .build())
- .build();
+ InputParam atSomeoneInRoom = InputParam
+ .newBuilder(WebexTeamsParamsConstants.NAME_WEBEX_TEAMS_AT_SOMEONE_IN_ROOM,
+ WebexTeamsParamsConstants.WEBEX_TEAMS_AT_SOMEONE_IN_ROOM)
+ .setPlaceholder("use ,(eng commas) to separate multiple emails")
+ .addValidate(Validate.newBuilder()
+ .setRequired(false)
+ .build())
+ .build();
- RadioParam destination = RadioParam.newBuilder(WebexTeamsParamsConstants.NAME_WEBEX_TEAMS_DESTINATION, WebexTeamsParamsConstants.WEBEX_TEAMS_DESTINATION)
- .addParamsOptions(new ParamsOptions(WebexTeamsDestination.ROOM_ID.getDescp(), WebexTeamsDestination.ROOM_ID.getDescp(), false))
- .addParamsOptions(new ParamsOptions(WebexTeamsDestination.PERSON_EMAIL.getDescp(), WebexTeamsDestination.PERSON_EMAIL.getDescp(), false))
- .addParamsOptions(new ParamsOptions(WebexTeamsDestination.PERSON_ID.getDescp(), WebexTeamsDestination.PERSON_ID.getDescp(), false))
- .setValue(WebexTeamsDestination.ROOM_ID.getDescp())
- .addValidate(Validate.newBuilder().setRequired(true).build())
- .build();
+ RadioParam destination = RadioParam
+ .newBuilder(WebexTeamsParamsConstants.NAME_WEBEX_TEAMS_DESTINATION,
+ WebexTeamsParamsConstants.WEBEX_TEAMS_DESTINATION)
+ .addParamsOptions(new ParamsOptions(WebexTeamsDestination.ROOM_ID.getDescp(),
+ WebexTeamsDestination.ROOM_ID.getDescp(), false))
+ .addParamsOptions(new ParamsOptions(WebexTeamsDestination.PERSON_EMAIL.getDescp(),
+ WebexTeamsDestination.PERSON_EMAIL.getDescp(), false))
+ .addParamsOptions(new ParamsOptions(WebexTeamsDestination.PERSON_ID.getDescp(),
+ WebexTeamsDestination.PERSON_ID.getDescp(), false))
+ .setValue(WebexTeamsDestination.ROOM_ID.getDescp())
+ .addValidate(Validate.newBuilder().setRequired(true).build())
+ .build();
paramsList.add(botAccessToken);
paramsList.add(roomId);
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-webexteams/src/main/java/org/apache/dolphinscheduler/plugin/alert/webexteams/WebexTeamsDestination.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-webexteams/src/main/java/org/apache/dolphinscheduler/plugin/alert/webexteams/WebexTeamsDestination.java
index 1d23aed591..694fd3fdea 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-webexteams/src/main/java/org/apache/dolphinscheduler/plugin/alert/webexteams/WebexTeamsDestination.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-webexteams/src/main/java/org/apache/dolphinscheduler/plugin/alert/webexteams/WebexTeamsDestination.java
@@ -25,6 +25,7 @@ import java.util.Map;
import com.google.common.base.Functions;
public enum WebexTeamsDestination {
+
/**
* 0 ROOM_ID;
* 1 PERSON_EMAIL;
@@ -51,7 +52,8 @@ public enum WebexTeamsDestination {
}
private static final Map<String, WebexTeamsDestination> WEBEX_TEAMS_DESTINATION_MAP =
- Arrays.stream(WebexTeamsDestination.values()).collect(toMap(WebexTeamsDestination::getDescp, Functions.identity()));
+ Arrays.stream(WebexTeamsDestination.values())
+ .collect(toMap(WebexTeamsDestination::getDescp, Functions.identity()));
public static WebexTeamsDestination of(String descp) {
if (WEBEX_TEAMS_DESTINATION_MAP.containsKey(descp)) {
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-webexteams/src/main/java/org/apache/dolphinscheduler/plugin/alert/webexteams/WebexTeamsSender.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-webexteams/src/main/java/org/apache/dolphinscheduler/plugin/alert/webexteams/WebexTeamsSender.java
index 7b61696c8f..adbbbe9eb1 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-webexteams/src/main/java/org/apache/dolphinscheduler/plugin/alert/webexteams/WebexTeamsSender.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-webexteams/src/main/java/org/apache/dolphinscheduler/plugin/alert/webexteams/WebexTeamsSender.java
@@ -39,6 +39,7 @@ import org.slf4j.Logger;
import com.google.common.base.Preconditions;
public final class WebexTeamsSender {
+
private static final Logger log = org.slf4j.LoggerFactory.getLogger(WebexTeamsSender.class);
private final String botAccessToken;
@@ -57,7 +58,9 @@ public final class WebexTeamsSender {
destination = WebexTeamsDestination.of(config.get(WebexTeamsParamsConstants.NAME_WEBEX_TEAMS_DESTINATION));
Preconditions.checkArgument(!Objects.isNull(botAccessToken), "WebexTeams bot access token can not be null");
Preconditions.checkArgument(!Objects.isNull(destination), "WebexTeams message destination can not be null");
- Preconditions.checkArgument((!Objects.isNull(roomId) || !Objects.isNull(toPersonId) || !Objects.isNull(toPersonEmail)),"WebexTeams message destination could not be determined. Provide only one destination in the roomId, toPersonEmail, or toPersonId field");
+ Preconditions.checkArgument(
+ (!Objects.isNull(roomId) || !Objects.isNull(toPersonId) || !Objects.isNull(toPersonEmail)),
+ "WebexTeams message destination could not be determined. Provide only one destination in the roomId, toPersonEmail, or toPersonId field");
}
public AlertResult sendWebexTeamsAlter(AlertData alertData) {
@@ -137,11 +140,11 @@ public final class WebexTeamsSender {
public static String addAtPersonEmailInRoom(String formatContent, String atPersonEmailInRoom) {
String[] emailArr = atPersonEmailInRoom.split(",");
StringBuilder formatContentBuilder = new StringBuilder(formatContent);
- for (String email: emailArr) {
+ for (String email : emailArr) {
formatContentBuilder.append(" <@personEmail:").append(email).append(">");
}
- return formatContentBuilder.toString();
+ return formatContentBuilder.toString();
}
public static String formatContent(AlertData alertData) {
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/pom.xml
index b293ac6c1e..3576f0c5e2 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/pom.xml
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/pom.xml
@@ -15,15 +15,14 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>dolphinscheduler-alert-plugins</artifactId>
<groupId>org.apache.dolphinscheduler</groupId>
+ <artifactId>dolphinscheduler-alert-plugins</artifactId>
<version>dev-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>dolphinscheduler-alert-wechat</artifactId>
<packaging>jar</packaging>
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatAlertChannel.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatAlertChannel.java
index 94b43ea300..786cdb159f 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatAlertChannel.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatAlertChannel.java
@@ -25,6 +25,7 @@ import org.apache.dolphinscheduler.alert.api.AlertResult;
import java.util.Map;
public final class WeChatAlertChannel implements AlertChannel {
+
@Override
public AlertResult process(AlertInfo info) {
AlertData alertData = info.getAlertData();
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatAlertChannelFactory.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatAlertChannelFactory.java
index 39a4a8159f..a357756090 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatAlertChannelFactory.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatAlertChannelFactory.java
@@ -34,6 +34,7 @@ import com.google.auto.service.AutoService;
@AutoService(AlertChannelFactory.class)
public final class WeChatAlertChannelFactory implements AlertChannelFactory {
+
@Override
public String name() {
return "WeChat";
@@ -41,47 +42,58 @@ public final class WeChatAlertChannelFactory implements AlertChannelFactory {
@Override
public List<PluginParams> params() {
- InputParam corpIdParam = InputParam.newBuilder(WeChatAlertParamsConstants.NAME_ENTERPRISE_WE_CHAT_CORP_ID, WeChatAlertParamsConstants.ENTERPRISE_WE_CHAT_CORP_ID)
- .setPlaceholder("please input corp id ")
- .addValidate(Validate.newBuilder()
- .setRequired(true)
- .build())
- .build();
+ InputParam corpIdParam = InputParam
+ .newBuilder(WeChatAlertParamsConstants.NAME_ENTERPRISE_WE_CHAT_CORP_ID,
+ WeChatAlertParamsConstants.ENTERPRISE_WE_CHAT_CORP_ID)
+ .setPlaceholder("please input corp id ")
+ .addValidate(Validate.newBuilder()
+ .setRequired(true)
+ .build())
+ .build();
- InputParam secretParam = InputParam.newBuilder(WeChatAlertParamsConstants.NAME_ENTERPRISE_WE_CHAT_SECRET, WeChatAlertParamsConstants.ENTERPRISE_WE_CHAT_SECRET)
- .setPlaceholder("please input secret ")
- .addValidate(Validate.newBuilder()
- .setRequired(true)
- .build())
- .build();
+ InputParam secretParam = InputParam
+ .newBuilder(WeChatAlertParamsConstants.NAME_ENTERPRISE_WE_CHAT_SECRET,
+ WeChatAlertParamsConstants.ENTERPRISE_WE_CHAT_SECRET)
+ .setPlaceholder("please input secret ")
+ .addValidate(Validate.newBuilder()
+ .setRequired(true)
+ .build())
+ .build();
- InputParam usersParam = InputParam.newBuilder(WeChatAlertParamsConstants.NAME_ENTERPRISE_WE_CHAT_USERS, WeChatAlertParamsConstants.ENTERPRISE_WE_CHAT_USERS)
- .setPlaceholder("use `|` to separate userIds and `@all` to everyone ")
- .addValidate(Validate.newBuilder()
- .setRequired(false)
- .build())
- .build();
+ InputParam usersParam = InputParam
+ .newBuilder(WeChatAlertParamsConstants.NAME_ENTERPRISE_WE_CHAT_USERS,
+ WeChatAlertParamsConstants.ENTERPRISE_WE_CHAT_USERS)
+ .setPlaceholder("use `|` to separate userIds and `@all` to everyone ")
+ .addValidate(Validate.newBuilder()
+ .setRequired(false)
+ .build())
+ .build();
- InputParam agentIdParam = InputParam.newBuilder(WeChatAlertParamsConstants.NAME_ENTERPRISE_WE_CHAT_AGENT_ID, WeChatAlertParamsConstants.ENTERPRISE_WE_CHAT_AGENT_ID)
- .setPlaceholder("please input agent id or chat id ")
- .addValidate(Validate.newBuilder()
- .setRequired(true)
- .build())
- .build();
+ InputParam agentIdParam = InputParam
+ .newBuilder(WeChatAlertParamsConstants.NAME_ENTERPRISE_WE_CHAT_AGENT_ID,
+ WeChatAlertParamsConstants.ENTERPRISE_WE_CHAT_AGENT_ID)
+ .setPlaceholder("please input agent id or chat id ")
+ .addValidate(Validate.newBuilder()
+ .setRequired(true)
+ .build())
+ .build();
- RadioParam sendType = RadioParam.newBuilder(WeChatAlertParamsConstants.NAME_ENTERPRISE_WE_CHAT_SEND_TYPE, WeChatAlertParamsConstants.ENTERPRISE_WE_CHAT_SEND_TYPE)
+ RadioParam sendType = RadioParam
+ .newBuilder(WeChatAlertParamsConstants.NAME_ENTERPRISE_WE_CHAT_SEND_TYPE,
+ WeChatAlertParamsConstants.ENTERPRISE_WE_CHAT_SEND_TYPE)
.addParamsOptions(new ParamsOptions(WeChatType.APP.getDescp(), WeChatType.APP.getDescp(), false))
- .addParamsOptions(new ParamsOptions(WeChatType.APPCHAT.getDescp(), WeChatType.APPCHAT.getDescp(), false))
+ .addParamsOptions(
+ new ParamsOptions(WeChatType.APPCHAT.getDescp(), WeChatType.APPCHAT.getDescp(), false))
.setValue(WeChatType.APP.getDescp())
.addValidate(Validate.newBuilder().setRequired(true).build())
.build();
RadioParam showType = RadioParam.newBuilder(AlertConstants.NAME_SHOW_TYPE, AlertConstants.SHOW_TYPE)
- .addParamsOptions(new ParamsOptions(ShowType.MARKDOWN.getDescp(), ShowType.MARKDOWN.getDescp(), false))
- .addParamsOptions(new ParamsOptions(ShowType.TEXT.getDescp(), ShowType.TEXT.getDescp(), false))
- .setValue(ShowType.MARKDOWN.getDescp())
- .addValidate(Validate.newBuilder().setRequired(true).build())
- .build();
+ .addParamsOptions(new ParamsOptions(ShowType.MARKDOWN.getDescp(), ShowType.MARKDOWN.getDescp(), false))
+ .addParamsOptions(new ParamsOptions(ShowType.TEXT.getDescp(), ShowType.TEXT.getDescp(), false))
+ .setValue(ShowType.MARKDOWN.getDescp())
+ .addValidate(Validate.newBuilder().setRequired(true).build())
+ .build();
return Arrays.asList(corpIdParam, secretParam, usersParam, agentIdParam, sendType, showType);
}
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatAlertConstants.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatAlertConstants.java
index 36ebc1c8d4..7f5eaef4f9 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatAlertConstants.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatAlertConstants.java
@@ -18,6 +18,7 @@
package org.apache.dolphinscheduler.plugin.alert.wechat;
public final class WeChatAlertConstants {
+
static final String MARKDOWN_QUOTE = ">";
static final String MARKDOWN_ENTER = "\n";
@@ -29,7 +30,8 @@ public final class WeChatAlertConstants {
static final String WE_CHAT_APP_CHAT_PUSH_URL = "https://qyapi.weixin.qq.com/cgi-bin/appchat/send?access_token" +
"={token}";
- static final String WE_CHAT_TOKEN_URL = "https://qyapi.weixin.qq.com/cgi-bin/gettoken?corpid={corpId}&corpsecret={secret}";
+ static final String WE_CHAT_TOKEN_URL =
+ "https://qyapi.weixin.qq.com/cgi-bin/gettoken?corpid={corpId}&corpsecret={secret}";
static final String WE_CHAT_CONTENT_KEY = "content";
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatAlertParamsConstants.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatAlertParamsConstants.java
index d8085b901f..9511b04f88 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatAlertParamsConstants.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatAlertParamsConstants.java
@@ -18,6 +18,7 @@
package org.apache.dolphinscheduler.plugin.alert.wechat;
public final class WeChatAlertParamsConstants {
+
static final String ENTERPRISE_WE_CHAT_CORP_ID = "$t('corpId')";
static final String NAME_ENTERPRISE_WE_CHAT_CORP_ID = "corpId";
static final String ENTERPRISE_WE_CHAT_SECRET = "$t('secret')";
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatSender.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatSender.java
index b8ed73d587..78408c5ba7 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatSender.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatSender.java
@@ -17,10 +17,16 @@
package org.apache.dolphinscheduler.plugin.alert.wechat;
+import static java.util.Objects.requireNonNull;
+import static org.apache.dolphinscheduler.plugin.alert.wechat.WeChatAlertConstants.WE_CHAT_DUPLICATE_CHECK_INTERVAL_ZERO;
+import static org.apache.dolphinscheduler.plugin.alert.wechat.WeChatAlertConstants.WE_CHAT_ENABLE_ID_TRANS;
+import static org.apache.dolphinscheduler.plugin.alert.wechat.WeChatAlertConstants.WE_CHAT_MESSAGE_SAFE_PUBLICITY;
+
import org.apache.dolphinscheduler.alert.api.AlertConstants;
import org.apache.dolphinscheduler.alert.api.AlertResult;
import org.apache.dolphinscheduler.spi.utils.JSONUtils;
import org.apache.dolphinscheduler.spi.utils.StringUtils;
+
import org.apache.http.HttpEntity;
import org.apache.http.client.methods.CloseableHttpResponse;
import org.apache.http.client.methods.HttpGet;
@@ -29,8 +35,6 @@ import org.apache.http.entity.StringEntity;
import org.apache.http.impl.client.CloseableHttpClient;
import org.apache.http.impl.client.HttpClients;
import org.apache.http.util.EntityUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import java.io.IOException;
import java.util.HashMap;
@@ -40,11 +44,11 @@ import java.util.Map;
import java.util.Map.Entry;
import java.util.Set;
-
-import static java.util.Objects.requireNonNull;
-import static org.apache.dolphinscheduler.plugin.alert.wechat.WeChatAlertConstants.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
public final class WeChatSender {
+
private static final Logger logger = LoggerFactory.getLogger(WeChatSender.class);
private static final String MUST_NOT_NULL = " must not null";
private static final String ALERT_STATUS = "false";
@@ -210,11 +214,15 @@ public final class WeChatSender {
String msgJson = "";
if (sendType.equals(WeChatType.APP.getDescp())) {
enterpriseWeChatPushUrlReplace = WeChatAlertConstants.WE_CHAT_PUSH_URL.replace(TOKEN_REGEX, weChatToken);
- WechatAppMessage wechatAppMessage = new WechatAppMessage(weChatUsers, showType, Integer.valueOf(weChatAgentIdChatId), contentMap, WE_CHAT_MESSAGE_SAFE_PUBLICITY, WE_CHAT_ENABLE_ID_TRANS, WE_CHAT_DUPLICATE_CHECK_INTERVAL_ZERO);
+ WechatAppMessage wechatAppMessage = new WechatAppMessage(weChatUsers, showType,
+ Integer.valueOf(weChatAgentIdChatId), contentMap, WE_CHAT_MESSAGE_SAFE_PUBLICITY,
+ WE_CHAT_ENABLE_ID_TRANS, WE_CHAT_DUPLICATE_CHECK_INTERVAL_ZERO);
msgJson = JSONUtils.toJsonString(wechatAppMessage);
} else if (sendType.equals(WeChatType.APPCHAT.getDescp())) {
- enterpriseWeChatPushUrlReplace = WeChatAlertConstants.WE_CHAT_APP_CHAT_PUSH_URL.replace(TOKEN_REGEX, weChatToken);
- WechatAppChatMessage wechatAppChatMessage = new WechatAppChatMessage(weChatAgentIdChatId, showType, contentMap, WE_CHAT_MESSAGE_SAFE_PUBLICITY);
+ enterpriseWeChatPushUrlReplace =
+ WeChatAlertConstants.WE_CHAT_APP_CHAT_PUSH_URL.replace(TOKEN_REGEX, weChatToken);
+ WechatAppChatMessage wechatAppChatMessage =
+ new WechatAppChatMessage(weChatAgentIdChatId, showType, contentMap, WE_CHAT_MESSAGE_SAFE_PUBLICITY);
msgJson = JSONUtils.toJsonString(wechatAppChatMessage);
}
@@ -248,6 +256,7 @@ public final class WeChatSender {
}
static final class WeChatSendMsgResponse {
+
private Integer errcode;
private String errmsg;
@@ -302,7 +311,8 @@ public final class WeChatSender {
}
public String toString() {
- return "WeChatSender.WeChatSendMsgResponse(errcode=" + this.getErrcode() + ", errmsg=" + this.getErrmsg() + ")";
+ return "WeChatSender.WeChatSendMsgResponse(errcode=" + this.getErrcode() + ", errmsg=" + this.getErrmsg()
+ + ")";
}
}
}
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatType.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatType.java
index 9060b53089..109da59944 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatType.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WeChatType.java
@@ -15,10 +15,10 @@
* limitations under the License.
*/
-
package org.apache.dolphinscheduler.plugin.alert.wechat;
public enum WeChatType {
+
APP(1, "APP/应用"),
APPCHAT(2, "GROUP CHAT/群聊"),
;
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WechatAppChatMessage.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WechatAppChatMessage.java
index e04f7335b8..9c16f759fa 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WechatAppChatMessage.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WechatAppChatMessage.java
@@ -25,8 +25,8 @@ public class WechatAppChatMessage {
private String chatid;
private String msgtype;
- private Map<String,String> text;
- private Map<String,String> markdown;
+ private Map<String, String> text;
+ private Map<String, String> markdown;
private Integer safe;
public String getChatid() {
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WechatAppMessage.java b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WechatAppMessage.java
index dbb74a6a93..f5ec7183ba 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WechatAppMessage.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/dolphinscheduler-alert-wechat/src/main/java/org/apache/dolphinscheduler/plugin/alert/wechat/WechatAppMessage.java
@@ -99,7 +99,8 @@ public class WechatAppMessage {
public WechatAppMessage() {
}
- public WechatAppMessage(String touser, String msgtype, Integer agentid, Map<String, String> contentMap, Integer safe, Integer enableIdTrans, Integer enableDuplicateCheck) {
+ public WechatAppMessage(String touser, String msgtype, Integer agentid, Map<String, String> contentMap,
+ Integer safe, Integer enableIdTrans, Integer enableDuplicateCheck) {
this.touser = touser;
this.msgtype = msgtype;
this.agentid = agentid;
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/pom.xml b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/pom.xml
index a014f8b17c..df705e9ea2 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-plugins/pom.xml
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-plugins/pom.xml
@@ -15,15 +15,14 @@
~ See the License for the specific language governing permissions and
~ limitations under the License.
-->
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>dolphinscheduler-alert</artifactId>
<groupId>org.apache.dolphinscheduler</groupId>
+ <artifactId>dolphinscheduler-alert</artifactId>
<version>dev-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
<artifactId>dolphinscheduler-alert-plugins</artifactId>
<packaging>pom</packaging>
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert/AlertPluginManager.java b/dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert/AlertPluginManager.java
index 782bf0aa85..78ff13d987 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert/AlertPluginManager.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert/AlertPluginManager.java
@@ -30,11 +30,6 @@ import org.apache.dolphinscheduler.spi.params.base.PluginParams;
import org.apache.dolphinscheduler.spi.params.base.Validate;
import org.apache.dolphinscheduler.spi.params.radio.RadioParam;
import org.apache.dolphinscheduler.spi.plugin.PrioritySPIFactory;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.boot.context.event.ApplicationReadyEvent;
-import org.springframework.context.event.EventListener;
-import org.springframework.stereotype.Component;
import java.util.ArrayList;
import java.util.HashMap;
@@ -42,10 +37,15 @@ import java.util.List;
import java.util.Map;
import java.util.Optional;
-import static java.lang.String.format;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.boot.context.event.ApplicationReadyEvent;
+import org.springframework.context.event.EventListener;
+import org.springframework.stereotype.Component;
@Component
public final class AlertPluginManager {
+
private static final Logger logger = LoggerFactory.getLogger(AlertPluginManager.class);
private final PluginDao pluginDao;
@@ -59,20 +59,22 @@ public final class AlertPluginManager {
private final PluginParams warningTypeParams = getWarningTypeParams();
public PluginParams getWarningTypeParams() {
- return
- RadioParam.newBuilder(AlertConstants.NAME_WARNING_TYPE, AlertConstants.WARNING_TYPE)
- .addParamsOptions(new ParamsOptions(WarningType.SUCCESS.getDescp(), WarningType.SUCCESS.getDescp(), false))
- .addParamsOptions(new ParamsOptions(WarningType.FAILURE.getDescp(), WarningType.FAILURE.getDescp(), false))
- .addParamsOptions(new ParamsOptions(WarningType.ALL.getDescp(), WarningType.ALL.getDescp(), false))
- .setValue(WarningType.ALL.getDescp())
- .addValidate(Validate.newBuilder().setRequired(true).build())
- .build();
+ return RadioParam.newBuilder(AlertConstants.NAME_WARNING_TYPE, AlertConstants.WARNING_TYPE)
+ .addParamsOptions(
+ new ParamsOptions(WarningType.SUCCESS.getDescp(), WarningType.SUCCESS.getDescp(), false))
+ .addParamsOptions(
+ new ParamsOptions(WarningType.FAILURE.getDescp(), WarningType.FAILURE.getDescp(), false))
+ .addParamsOptions(new ParamsOptions(WarningType.ALL.getDescp(), WarningType.ALL.getDescp(), false))
+ .setValue(WarningType.ALL.getDescp())
+ .addValidate(Validate.newBuilder().setRequired(true).build())
+ .build();
}
@EventListener
public void installPlugin(ApplicationReadyEvent readyEvent) {
- PrioritySPIFactory<AlertChannelFactory> prioritySPIFactory = new PrioritySPIFactory<>(AlertChannelFactory.class);
+ PrioritySPIFactory<AlertChannelFactory> prioritySPIFactory =
+ new PrioritySPIFactory<>(AlertChannelFactory.class);
for (Map.Entry<String, AlertChannelFactory> entry : prioritySPIFactory.getSPIMap().entrySet()) {
String name = entry.getKey();
AlertChannelFactory factory = entry.getValue();
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert/AlertRequestProcessor.java b/dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert/AlertRequestProcessor.java
index 6bb4aa0049..930d9180be 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert/AlertRequestProcessor.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert/AlertRequestProcessor.java
@@ -34,6 +34,7 @@ import io.netty.channel.Channel;
@Component
public final class AlertRequestProcessor implements NettyRequestProcessor {
+
private static final Logger logger = LoggerFactory.getLogger(AlertRequestProcessor.class);
private final AlertSenderService alertSenderService;
@@ -44,18 +45,19 @@ public final class AlertRequestProcessor implements NettyRequestProcessor {
@Override
public void process(Channel channel, Command command) {
- checkArgument(CommandType.ALERT_SEND_REQUEST == command.getType(), "invalid command type: %s", command.getType());
+ checkArgument(CommandType.ALERT_SEND_REQUEST == command.getType(), "invalid command type: %s",
+ command.getType());
AlertSendRequestCommand alertSendRequestCommand = JsonSerializer.deserialize(
- command.getBody(), AlertSendRequestCommand.class);
+ command.getBody(), AlertSendRequestCommand.class);
logger.info("Received command : {}", alertSendRequestCommand);
AlertSendResponseCommand alertSendResponseCommand = alertSenderService.syncHandler(
- alertSendRequestCommand.getGroupId(),
- alertSendRequestCommand.getTitle(),
- alertSendRequestCommand.getContent(),
- alertSendRequestCommand.getWarnType());
+ alertSendRequestCommand.getGroupId(),
+ alertSendRequestCommand.getTitle(),
+ alertSendRequestCommand.getContent(),
+ alertSendRequestCommand.getWarnType());
channel.writeAndFlush(alertSendResponseCommand.convert2Command(command.getOpaque()));
}
}
diff --git a/dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert/AlertServerMetrics.java b/dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert/AlertServerMetrics.java
index 0218e51d2b..7a8b89a52d 100644
--- a/dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert/AlertServerMetrics.java
+++ b/dolphinscheduler-alert/dolphinscheduler-alert-server/src/main/java/org/apache/dolphinscheduler/alert/AlertServerMetrics.java
@@ -19,10 +19,10 @@ package org.apache.dolphinscheduler.alert;
import java.util.function.Supplier;
+import lombok.experimental.UtilityClass;
import io.micrometer.core.instrument.Counter;
import io.micrometer.core.instrument.Gauge;
import io.micrometer.core.instrument.Metrics;
-import lombok.experimental.UtilityClass;
@UtilityClass
public class AlertServerMetrics {
diff --git a/dolphinscheduler-alert/pom.xml b/dolphinscheduler-alert/pom.xml
index ee7e379536..bcf840410d 100644
--- a/dolphinscheduler-alert/pom.xml
+++ b/dolphinscheduler-alert/pom.xml
@@ -17,18 +17,16 @@
~ specific language governing permissions and limitations
~ under the License.
-->
-
-<project xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://maven.apache.org/POM/4.0.0"
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+ <modelVersion>4.0.0</modelVersion>
<parent>
- <artifactId>dolphinscheduler</artifactId>
<groupId>org.apache.dolphinscheduler</groupId>
+ <artifactId>dolphinscheduler</artifactId>
<version>dev-SNAPSHOT</version>
</parent>
- <modelVersion>4.0.0</modelVersion>
- <packaging>pom</packaging>
<artifactId>dolphinscheduler-alert</artifactId>
+ <packaging>pom</packaging>
<modules>
<module>dolphinscheduler-alert-api</module>
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/ApiApplicationServer.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/ApiApplicationServer.java
index 08a73e69e3..2994208ea2 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/ApiApplicationServer.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/ApiApplicationServer.java
@@ -21,7 +21,6 @@ import org.apache.dolphinscheduler.common.enums.PluginType;
import org.apache.dolphinscheduler.dao.PluginDao;
import org.apache.dolphinscheduler.dao.entity.PluginDefine;
import org.apache.dolphinscheduler.plugin.task.api.TaskChannelFactory;
-import org.apache.dolphinscheduler.plugin.task.api.TaskPluginException;
import org.apache.dolphinscheduler.service.task.TaskPluginManager;
import org.apache.dolphinscheduler.spi.params.PluginParamsTransfer;
import org.apache.dolphinscheduler.spi.params.base.PluginParams;
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/aspect/AccessLogAnnotation.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/aspect/AccessLogAnnotation.java
index db62bcda3a..dd62af88de 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/aspect/AccessLogAnnotation.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/aspect/AccessLogAnnotation.java
@@ -27,6 +27,7 @@ import java.lang.annotation.Target;
@Retention(RetentionPolicy.RUNTIME)
@Documented
public @interface AccessLogAnnotation {
+
// ignore request args
String[] ignoreRequestArgs() default {"loginUser"};
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/aspect/AccessLogAspect.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/aspect/AccessLogAspect.java
index b20b6d8425..6d78ada123 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/aspect/AccessLogAspect.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/aspect/AccessLogAspect.java
@@ -47,6 +47,7 @@ import org.springframework.web.context.request.ServletRequestAttributes;
@Aspect
@Component
public class AccessLogAspect {
+
private static final Logger logger = LoggerFactory.getLogger(AccessLogAspect.class);
private static final String TRACE_ID = "traceId";
@@ -56,7 +57,7 @@ public class AccessLogAspect {
private static final Pattern sensitiveDataPattern = Pattern.compile(sensitiveDataRegEx, Pattern.CASE_INSENSITIVE);
@Pointcut("@annotation(org.apache.dolphinscheduler.api.aspect.AccessLogAnnotation)")
- public void logPointCut(){
+ public void logPointCut() {
// Do nothing because of it's a pointcut
}
@@ -65,7 +66,7 @@ public class AccessLogAspect {
long startTime = System.currentTimeMillis();
// fetch AccessLogAnnotation
- MethodSignature sign = (MethodSignature) proceedingJoinPoint.getSignature();
+ MethodSignature sign = (MethodSignature) proceedingJoinPoint.getSignature();
Method method = sign.getMethod();
AccessLogAnnotation annotation = method.getAnnotation(AccessLogAnnotation.class);
@@ -73,7 +74,8 @@ public class AccessLogAspect {
// log request
if (!annotation.ignoreRequest()) {
- ServletRequestAttributes attributes = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
+ ServletRequestAttributes attributes =
+ (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
if (attributes != null) {
HttpServletRequest request = attributes.getRequest();
String traceIdFromHeader = request.getHeader(TRACE_ID);
@@ -92,7 +94,8 @@ public class AccessLogAspect {
userName,
request.getRequestURI(),
request.getMethod(),
- proceedingJoinPoint.getSignature().getDeclaringTypeName() + "." + proceedingJoinPoint.getSignature().getName(),
+ proceedingJoinPoint.getSignature().getDeclaringTypeName() + "."
+ + proceedingJoinPoint.getSignature().getName(),
argsString);
}
@@ -102,7 +105,8 @@ public class AccessLogAspect {
// log response
if (!annotation.ignoreResponse()) {
- logger.info("RESPONSE TRACE_ID:{}, BODY:{}, REQUEST DURATION:{} milliseconds", traceId, ob, (System.currentTimeMillis() - startTime));
+ logger.info("RESPONSE TRACE_ID:{}, BODY:{}, REQUEST DURATION:{} milliseconds", traceId, ob,
+ (System.currentTimeMillis() - startTime));
}
return ob;
@@ -134,7 +138,7 @@ public class AccessLogAspect {
boolean exists = false;
while (matcher.find()) {
if (matcher.groupCount() == 3) {
- stream = IntStream.concat(stream, IntStream.range(matcher.end(1),matcher.end(2)));
+ stream = IntStream.concat(stream, IntStream.range(matcher.end(1), matcher.end(2)));
exists = true;
}
}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/AuditMessage.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/AuditMessage.java
index 01ef5a28e8..0d936f0ad5 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/AuditMessage.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/audit/AuditMessage.java
@@ -24,6 +24,7 @@ import org.apache.dolphinscheduler.dao.entity.User;
import java.util.Date;
public class AuditMessage {
+
private User user;
private Date auditDate;
@@ -34,7 +35,8 @@ public class AuditMessage {
private Integer resourceId;
- public AuditMessage(User user, Date auditDate, AuditResourceType resourceType, AuditOperationType operation, Integer resourceId) {
+ public AuditMessage(User user, Date auditDate, AuditResourceType resourceType, AuditOperationType operation,
+ Integer resourceId) {
this.user = user;
this.auditDate = auditDate;
this.resourceType = resourceType;
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/configuration/AuditConfiguration.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/configuration/AuditConfiguration.java
index 090b46888f..451fcbc40b 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/configuration/AuditConfiguration.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/configuration/AuditConfiguration.java
@@ -25,6 +25,7 @@ import org.springframework.stereotype.Component;
@EnableConfigurationProperties
@ConfigurationProperties(value = "audit", ignoreUnknownFields = false)
public class AuditConfiguration {
+
private boolean enabled;
public boolean getEnabled() {
@@ -34,4 +35,4 @@ public class AuditConfiguration {
public void setEnabled(boolean enabled) {
this.enabled = enabled;
}
-}
\ No newline at end of file
+}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/configuration/OpenAPITranslationConfiguration.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/configuration/OpenAPITranslationConfiguration.java
index 735f71f9ef..4e1c67bd0b 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/configuration/OpenAPITranslationConfiguration.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/configuration/OpenAPITranslationConfiguration.java
@@ -18,20 +18,24 @@ package org.apache.dolphinscheduler.api.configuration;
import static java.util.stream.Collectors.toList;
import static java.util.stream.Collectors.toSet;
+
+import springfox.documentation.service.Operation;
+import springfox.documentation.service.RequestParameter;
+import springfox.documentation.spi.DocumentationType;
+import springfox.documentation.spi.service.OperationBuilderPlugin;
+import springfox.documentation.spi.service.contexts.OperationContext;
+
import java.util.Collection;
import java.util.Locale;
import java.util.Set;
+
+import lombok.RequiredArgsConstructor;
+
import org.springframework.context.MessageSource;
import org.springframework.context.i18n.LocaleContextHolder;
import org.springframework.core.Ordered;
import org.springframework.core.annotation.Order;
import org.springframework.stereotype.Component;
-import lombok.RequiredArgsConstructor;
-import springfox.documentation.service.Operation;
-import springfox.documentation.service.RequestParameter;
-import springfox.documentation.spi.DocumentationType;
-import springfox.documentation.spi.service.OperationBuilderPlugin;
-import springfox.documentation.spi.service.contexts.OperationContext;
@Component
public class OpenAPITranslationConfiguration {
@@ -60,20 +64,20 @@ public class OpenAPITranslationConfiguration {
.collect(toSet());
Collection<RequestParameter> parameters = operation.getRequestParameters().stream()
- .map(it -> new RequestParameter(
- it.getName(),
- it.getIn(),
- messageSource.getMessage(it.getDescription(), null, it.getDescription(), locale),
- it.getRequired(),
- it.getDeprecated(),
- it.getHidden(),
- it.getParameterSpecification(),
- it.getScalarExample(),
- it.getExamples(),
- it.getPrecedence(),
- it.getExtensions(),
- it.getParameterIndex()))
- .collect(toList());
+ .map(it -> new RequestParameter(
+ it.getName(),
+ it.getIn(),
+ messageSource.getMessage(it.getDescription(), null, it.getDescription(), locale),
+ it.getRequired(),
+ it.getDeprecated(),
+ it.getHidden(),
+ it.getParameterSpecification(),
+ it.getScalarExample(),
+ it.getExamples(),
+ it.getPrecedence(),
+ it.getExtensions(),
+ it.getParameterIndex()))
+ .collect(toList());
context.operationBuilder()
.notes(notes)
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/configuration/PythonGatewayConfiguration.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/configuration/PythonGatewayConfiguration.java
index 5735e27fd2..fcfa973424 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/configuration/PythonGatewayConfiguration.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/configuration/PythonGatewayConfiguration.java
@@ -25,6 +25,7 @@ import org.springframework.stereotype.Component;
@EnableConfigurationProperties
@ConfigurationProperties(value = "python-gateway", ignoreUnknownFields = false)
public class PythonGatewayConfiguration {
+
private boolean enabled;
private String gatewayServerAddress;
private int gatewayServerPort;
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/configuration/TaskTypeConfiguration.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/configuration/TaskTypeConfiguration.java
index 64b6cc3e43..649e32c088 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/configuration/TaskTypeConfiguration.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/configuration/TaskTypeConfiguration.java
@@ -24,6 +24,9 @@ import org.apache.dolphinscheduler.common.config.YamlPropertySourceFactory;
import java.util.ArrayList;
import java.util.List;
+import lombok.Getter;
+import lombok.Setter;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.context.properties.ConfigurationProperties;
@@ -31,9 +34,6 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
import org.springframework.context.annotation.PropertySource;
import org.springframework.stereotype.Component;
-import lombok.Getter;
-import lombok.Setter;
-
@Component
@EnableConfigurationProperties
@PropertySource(value = {"classpath:task-type-config.yaml"}, factory = YamlPropertySourceFactory.class)
@@ -62,9 +62,11 @@ public class TaskTypeConfiguration {
universal.forEach(task -> defaultTaskTypes.add(new FavTaskDto(task, false, Constants.TYPE_UNIVERSAL)));
cloud.forEach(task -> defaultTaskTypes.add(new FavTaskDto(task, false, Constants.TYPE_CLOUD)));
logic.forEach(task -> defaultTaskTypes.add(new FavTaskDto(task, false, Constants.TYPE_LOGIC)));
- dataIntegration.forEach(task -> defaultTaskTypes.add(new FavTaskDto(task, false, Constants.TYPE_DATA_INTEGRATION)));
+ dataIntegration
+ .forEach(task -> defaultTaskTypes.add(new FavTaskDto(task, false, Constants.TYPE_DATA_INTEGRATION)));
dataQuality.forEach(task -> defaultTaskTypes.add(new FavTaskDto(task, false, Constants.TYPE_DATA_QUALITY)));
- machineLearning.forEach(task -> defaultTaskTypes.add(new FavTaskDto(task, false, Constants.TYPE_MACHINE_LEARNING)));
+ machineLearning
+ .forEach(task -> defaultTaskTypes.add(new FavTaskDto(task, false, Constants.TYPE_MACHINE_LEARNING)));
other.forEach(task -> defaultTaskTypes.add(new FavTaskDto(task, false, Constants.TYPE_OTHER)));
return defaultTaskTypes;
}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/configuration/TrafficConfiguration.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/configuration/TrafficConfiguration.java
index 3b66a2d6ca..47cb5230f3 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/configuration/TrafficConfiguration.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/configuration/TrafficConfiguration.java
@@ -17,11 +17,11 @@
package org.apache.dolphinscheduler.api.configuration;
-import lombok.Data;
-
import java.util.HashMap;
import java.util.Map;
+import lombok.Data;
+
import org.springframework.boot.context.properties.ConfigurationProperties;
import org.springframework.context.annotation.Configuration;
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/constants/ApiFuncIdentificationConstant.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/constants/ApiFuncIdentificationConstant.java
index 035d582e06..b93792307f 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/constants/ApiFuncIdentificationConstant.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/constants/ApiFuncIdentificationConstant.java
@@ -18,6 +18,7 @@
package org.apache.dolphinscheduler.api.constants;
import org.apache.dolphinscheduler.api.enums.ExecuteType;
+
import java.util.HashMap;
import java.util.Map;
@@ -30,7 +31,7 @@ public class ApiFuncIdentificationConstant {
public static final String ACCESS_TOKEN_DELETE = "security:token:delete";
public static final String ALERT_GROUP_VIEW = "security:alert-group:view";
public static final String ALERT_GROUP_CREATE = "security:alert-group:create";
- public static final String ALERT_GROUP_UPDATE = "security:alert-group:update";
+ public static final String ALERT_GROUP_UPDATE = "security:alert-group:update";
public static final String ALERT_GROUP_DELETE = "security:alert-group:delete";
public static final String TENANT_MANAGER = "security:tenant:view";
public static final String TENANT_CREATE = "security:tenant:create";
@@ -156,28 +157,28 @@ public class ApiFuncIdentificationConstant {
public static final String MONITOR_STATISTICS_VIEW = "monitor:statistics:view";
- public final static Map<ExecuteType,String> map = new HashMap<ExecuteType,String>();
+ public final static Map<ExecuteType, String> map = new HashMap<ExecuteType, String>();
- static{
- for(ExecuteType type : ExecuteType.values()){
- switch (type){
+ static {
+ for (ExecuteType type : ExecuteType.values()) {
+ switch (type) {
case REPEAT_RUNNING:
- map.put(type,RERUN);
+ map.put(type, RERUN);
break;
case RECOVER_SUSPENDED_PROCESS:
- map.put(type,RECOVERY_SUSPEND);
+ map.put(type, RECOVERY_SUSPEND);
break;
case START_FAILURE_TASK_PROCESS:
- map.put(type,FAILED_TO_RETRY);
+ map.put(type, FAILED_TO_RETRY);
break;
case STOP:
- map.put(type,STOP);
+ map.put(type, STOP);
break;
case PAUSE:
- map.put(type,PAUSE);
+ map.put(type, PAUSE);
break;
case NONE:
- map.put(type,null);
+ map.put(type, null);
break;
default:
}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/AccessTokenController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/AccessTokenController.java
index 82142768ce..8201eedfe2 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/AccessTokenController.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/AccessTokenController.java
@@ -29,8 +29,8 @@ import org.apache.dolphinscheduler.api.exceptions.ApiException;
import org.apache.dolphinscheduler.api.service.AccessTokenService;
import org.apache.dolphinscheduler.api.utils.Result;
import org.apache.dolphinscheduler.common.Constants;
-import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
import org.apache.dolphinscheduler.dao.entity.User;
+import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
import springfox.documentation.annotations.ApiIgnore;
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/AlertGroupController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/AlertGroupController.java
index 6453de0276..853336b3b7 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/AlertGroupController.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/AlertGroupController.java
@@ -30,8 +30,8 @@ import org.apache.dolphinscheduler.api.exceptions.ApiException;
import org.apache.dolphinscheduler.api.service.AlertGroupService;
import org.apache.dolphinscheduler.api.utils.Result;
import org.apache.dolphinscheduler.common.Constants;
-import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
import org.apache.dolphinscheduler.dao.entity.User;
+import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
import springfox.documentation.annotations.ApiIgnore;
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/AlertPluginInstanceController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/AlertPluginInstanceController.java
index a2ac7e0410..af805aa7e9 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/AlertPluginInstanceController.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/AlertPluginInstanceController.java
@@ -32,6 +32,7 @@ import org.apache.dolphinscheduler.api.utils.Result;
import org.apache.dolphinscheduler.common.Constants;
import org.apache.dolphinscheduler.dao.entity.User;
import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
+
import springfox.documentation.annotations.ApiIgnore;
import java.util.Map;
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ClusterController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ClusterController.java
index c8dcdff039..e247688ec7 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ClusterController.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ClusterController.java
@@ -29,8 +29,8 @@ import org.apache.dolphinscheduler.api.exceptions.ApiException;
import org.apache.dolphinscheduler.api.service.ClusterService;
import org.apache.dolphinscheduler.api.utils.Result;
import org.apache.dolphinscheduler.common.Constants;
-import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
import org.apache.dolphinscheduler.dao.entity.User;
+import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
import springfox.documentation.annotations.ApiIgnore;
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataQualityController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataQualityController.java
index 04203651fb..9b4e371240 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataQualityController.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataQualityController.java
@@ -28,8 +28,8 @@ import org.apache.dolphinscheduler.api.service.DqExecuteResultService;
import org.apache.dolphinscheduler.api.service.DqRuleService;
import org.apache.dolphinscheduler.api.utils.Result;
import org.apache.dolphinscheduler.common.Constants;
-import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
import org.apache.dolphinscheduler.dao.entity.User;
+import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
import springfox.documentation.annotations.ApiIgnore;
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataSourceController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataSourceController.java
index b344073664..3d9961e99b 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataSourceController.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataSourceController.java
@@ -36,10 +36,10 @@ import org.apache.dolphinscheduler.api.exceptions.ApiException;
import org.apache.dolphinscheduler.api.service.DataSourceService;
import org.apache.dolphinscheduler.api.utils.Result;
import org.apache.dolphinscheduler.common.Constants;
-import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
import org.apache.dolphinscheduler.dao.entity.User;
import org.apache.dolphinscheduler.plugin.datasource.api.datasource.BaseDataSourceParamDTO;
import org.apache.dolphinscheduler.plugin.datasource.api.utils.DataSourceUtils;
+import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
import org.apache.dolphinscheduler.service.utils.CommonUtils;
import org.apache.dolphinscheduler.spi.datasource.ConnectionParam;
import org.apache.dolphinscheduler.spi.enums.DbType;
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DsErrorController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DsErrorController.java
index f42df4f4e1..e97ffcfe7b 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DsErrorController.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DsErrorController.java
@@ -21,6 +21,7 @@ package org.apache.dolphinscheduler.api.controller;
import javax.servlet.RequestDispatcher;
import javax.servlet.http.HttpServletRequest;
+
import org.springframework.boot.web.servlet.error.ErrorController;
import org.springframework.http.HttpStatus;
import org.springframework.stereotype.Controller;
@@ -29,6 +30,7 @@ import org.springframework.web.servlet.ModelAndView;
@Controller
public class DsErrorController implements ErrorController {
+
@RequestMapping("/error")
public ModelAndView handleError(HttpServletRequest request) {
Object status = request.getAttribute(RequestDispatcher.ERROR_STATUS_CODE);
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/EnvironmentController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/EnvironmentController.java
index 72ea72d1b0..fb1bf11380 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/EnvironmentController.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/EnvironmentController.java
@@ -29,8 +29,8 @@ import org.apache.dolphinscheduler.api.exceptions.ApiException;
import org.apache.dolphinscheduler.api.service.EnvironmentService;
import org.apache.dolphinscheduler.api.utils.Result;
import org.apache.dolphinscheduler.common.Constants;
-import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
import org.apache.dolphinscheduler.dao.entity.User;
+import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
import springfox.documentation.annotations.ApiIgnore;
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ExecutorController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ExecutorController.java
index 98e69ab1f4..f672702b85 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ExecutorController.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ExecutorController.java
@@ -121,7 +121,7 @@ public class ExecutorController extends BaseController {
@ApiImplicitParam(name = "workerGroup", value = "WORKER_GROUP", dataType = "String", example = "default"),
@ApiImplicitParam(name = "environmentCode", value = "ENVIRONMENT_CODE", dataType = "Long", example = "-1"),
@ApiImplicitParam(name = "timeout", value = "TIMEOUT", dataType = "Int", example = "100"),
- @ApiImplicitParam(name = "expectedParallelismNumber", value = "EXPECTED_PARALLELISM_NUMBER", dataType = "Int" , example = "8"),
+ @ApiImplicitParam(name = "expectedParallelismNumber", value = "EXPECTED_PARALLELISM_NUMBER", dataType = "Int", example = "8"),
@ApiImplicitParam(name = "dryRun", value = "DRY_RUN", dataType = "Int", example = "0"),
@ApiImplicitParam(name = "testFlag", value = "TEST_FLAG", dataType = "Int", example = "0"),
@ApiImplicitParam(name = "complementDependentMode", value = "COMPLEMENT_DEPENDENT_MODE", dataType = "complementDependentMode")
@@ -166,7 +166,8 @@ public class ExecutorController extends BaseController {
Map<String, Object> result = execService.execProcessInstance(loginUser, projectCode, processDefinitionCode,
scheduleTime, execType, failureStrategy,
startNodeList, taskDependType, warningType, warningGroupId, runMode, processInstancePriority,
- workerGroup, environmentCode, timeout, startParamMap, expectedParallelismNumber, dryRun, testFlag, complementDependentMode);
+ workerGroup, environmentCode, timeout, startParamMap, expectedParallelismNumber, dryRun, testFlag,
+ complementDependentMode);
return returnDataList(result);
}
@@ -268,10 +269,12 @@ public class ExecutorController extends BaseController {
complementDependentMode);
if (!Status.SUCCESS.equals(result.get(Constants.STATUS))) {
- logger.error("Process definition start failed, projectCode:{}, processDefinitionCode:{}.", projectCode, processDefinitionCode);
+ logger.error("Process definition start failed, projectCode:{}, processDefinitionCode:{}.", projectCode,
+ processDefinitionCode);
startFailedProcessDefinitionCodeList.add(String.valueOf(processDefinitionCode));
} else
- logger.info("Start process definition complete, projectCode:{}, processDefinitionCode:{}.", projectCode, processDefinitionCode);
+ logger.info("Start process definition complete, projectCode:{}, processDefinitionCode:{}.", projectCode,
+ processDefinitionCode);
}
if (!startFailedProcessDefinitionCodeList.isEmpty()) {
@@ -303,9 +306,9 @@ public class ExecutorController extends BaseController {
public Result execute(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
@ApiParam(name = "projectCode", value = "PROJECT_CODE", required = true) @PathVariable long projectCode,
@RequestParam("processInstanceId") Integer processInstanceId,
- @RequestParam("executeType") ExecuteType executeType
- ) {
- logger.info("Start to execute process instance, projectCode:{}, processInstanceId:{}.", projectCode, processInstanceId);
+ @RequestParam("executeType") ExecuteType executeType) {
+ logger.info("Start to execute process instance, projectCode:{}, processInstanceId:{}.", projectCode,
+ processInstanceId);
Map<String, Object> result = execService.execute(loginUser, projectCode, processInstanceId, executeType);
return returnDataList(result);
}
@@ -344,10 +347,12 @@ public class ExecutorController extends BaseController {
Map<String, Object> singleResult =
execService.execute(loginUser, projectCode, processInstanceId, executeType);
if (!Status.SUCCESS.equals(singleResult.get(Constants.STATUS))) {
- logger.error("Start to execute process instance error, projectCode:{}, processInstanceId:{}.", projectCode, processInstanceId);
+ logger.error("Start to execute process instance error, projectCode:{}, processInstanceId:{}.",
+ projectCode, processInstanceId);
executeFailedIdList.add((String) singleResult.get(Constants.MSG));
} else
- logger.info("Start to execute process instance complete, projectCode:{}, processInstanceId:{}.", projectCode, processInstanceId);
+ logger.info("Start to execute process instance complete, projectCode:{}, processInstanceId:{}.",
+ projectCode, processInstanceId);
} catch (Exception e) {
executeFailedIdList
.add(MessageFormat.format(Status.PROCESS_INSTANCE_ERROR.getMsg(), strProcessInstanceId));
@@ -440,7 +445,8 @@ public class ExecutorController extends BaseController {
startParamMap = JSONUtils.toMap(startParams);
}
- logger.info("Start to execute stream task instance, projectCode:{}, taskDefinitionCode:{}, taskVersion:{}.", projectCode, code, version);
+ logger.info("Start to execute stream task instance, projectCode:{}, taskDefinitionCode:{}, taskVersion:{}.",
+ projectCode, code, version);
Map<String, Object> result = execService.execStreamTaskInstance(loginUser, projectCode, code, version,
warningGroupId, workerGroup, environmentCode, startParamMap, dryRun);
return returnDataList(result);
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/FavTaskController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/FavTaskController.java
index 98d38373f3..fb54b67283 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/FavTaskController.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/FavTaskController.java
@@ -17,8 +17,10 @@
package org.apache.dolphinscheduler.api.controller;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiOperation;
+import static org.apache.dolphinscheduler.api.enums.Status.ADD_TASK_TYPE_ERROR;
+import static org.apache.dolphinscheduler.api.enums.Status.DELETE_TASK_TYPE_ERROR;
+import static org.apache.dolphinscheduler.api.enums.Status.LIST_TASK_TYPE_ERROR;
+
import org.apache.dolphinscheduler.api.aspect.AccessLogAnnotation;
import org.apache.dolphinscheduler.api.dto.FavTaskDto;
import org.apache.dolphinscheduler.api.enums.Status;
@@ -27,6 +29,13 @@ import org.apache.dolphinscheduler.api.service.FavTaskService;
import org.apache.dolphinscheduler.api.utils.Result;
import org.apache.dolphinscheduler.common.Constants;
import org.apache.dolphinscheduler.dao.entity.User;
+
+import springfox.documentation.annotations.ApiIgnore;
+
+import java.util.List;
+
+import javax.annotation.Resource;
+
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.DeleteMapping;
import org.springframework.web.bind.annotation.GetMapping;
@@ -36,14 +45,9 @@ import org.springframework.web.bind.annotation.RequestAttribute;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.ResponseStatus;
import org.springframework.web.bind.annotation.RestController;
-import springfox.documentation.annotations.ApiIgnore;
-
-import javax.annotation.Resource;
-import java.util.List;
-import static org.apache.dolphinscheduler.api.enums.Status.ADD_TASK_TYPE_ERROR;
-import static org.apache.dolphinscheduler.api.enums.Status.DELETE_TASK_TYPE_ERROR;
-import static org.apache.dolphinscheduler.api.enums.Status.LIST_TASK_TYPE_ERROR;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
/**
* fav controller
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/K8sNamespaceController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/K8sNamespaceController.java
index 06a5adfdeb..9e95fd0e09 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/K8sNamespaceController.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/K8sNamespaceController.java
@@ -31,9 +31,9 @@ import org.apache.dolphinscheduler.api.exceptions.ApiException;
import org.apache.dolphinscheduler.api.service.K8sNamespaceService;
import org.apache.dolphinscheduler.api.utils.Result;
import org.apache.dolphinscheduler.common.Constants;
-import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
import org.apache.dolphinscheduler.dao.entity.K8sNamespace;
import org.apache.dolphinscheduler.dao.entity.User;
+import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
import springfox.documentation.annotations.ApiIgnore;
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/MonitorController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/MonitorController.java
index 9240ac45d8..1acbc99a40 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/MonitorController.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/MonitorController.java
@@ -28,6 +28,8 @@ import org.apache.dolphinscheduler.api.utils.Result;
import org.apache.dolphinscheduler.common.Constants;
import org.apache.dolphinscheduler.dao.entity.User;
+import springfox.documentation.annotations.ApiIgnore;
+
import java.util.Map;
import org.springframework.beans.factory.annotation.Autowired;
@@ -40,7 +42,6 @@ import org.springframework.web.bind.annotation.RestController;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
-import springfox.documentation.annotations.ApiIgnore;
/**
* monitor controller
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionController.java
index 55c66a6adb..dc29875ec4 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionController.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionController.java
@@ -38,26 +38,19 @@ import static org.apache.dolphinscheduler.api.enums.Status.VERIFY_PROCESS_DEFINI
import org.apache.dolphinscheduler.api.aspect.AccessLogAnnotation;
import org.apache.dolphinscheduler.api.enums.Status;
import org.apache.dolphinscheduler.api.exceptions.ApiException;
-import org.apache.dolphinscheduler.api.exceptions.ServiceException;
import org.apache.dolphinscheduler.api.service.ProcessDefinitionService;
import org.apache.dolphinscheduler.api.utils.PageInfo;
import org.apache.dolphinscheduler.api.utils.Result;
import org.apache.dolphinscheduler.common.Constants;
import org.apache.dolphinscheduler.common.enums.ProcessExecutionTypeEnum;
import org.apache.dolphinscheduler.common.enums.ReleaseState;
-import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
import org.apache.dolphinscheduler.dao.entity.ProcessDefinition;
import org.apache.dolphinscheduler.dao.entity.User;
+import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
import springfox.documentation.annotations.ApiIgnore;
-import org.apache.commons.lang3.StringUtils;
-
-import java.text.MessageFormat;
-import java.util.HashMap;
-import java.util.HashSet;
import java.util.Map;
-import java.util.Set;
import javax.servlet.http.HttpServletResponse;
@@ -685,7 +678,8 @@ public class ProcessDefinitionController extends BaseController {
@ApiParam(name = "projectCode", value = "PROJECT_CODE", required = true) @PathVariable long projectCode,
@RequestParam("codes") String codes) {
- Map<String, Object> result = processDefinitionService.batchDeleteProcessDefinitionByCodes(loginUser, projectCode, codes);
+ Map<String, Object> result =
+ processDefinitionService.batchDeleteProcessDefinitionByCodes(loginUser, projectCode, codes);
return returnDataList(result);
}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessInstanceController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessInstanceController.java
index b36ba8abd5..ebc5edde85 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessInstanceController.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessInstanceController.java
@@ -17,8 +17,17 @@
package org.apache.dolphinscheduler.api.controller;
-import io.swagger.annotations.*;
-import org.apache.commons.lang3.StringUtils;
+import static org.apache.dolphinscheduler.api.enums.Status.BATCH_DELETE_PROCESS_INSTANCE_BY_IDS_ERROR;
+import static org.apache.dolphinscheduler.api.enums.Status.DELETE_PROCESS_INSTANCE_BY_ID_ERROR;
+import static org.apache.dolphinscheduler.api.enums.Status.ENCAPSULATION_PROCESS_INSTANCE_GANTT_STRUCTURE_ERROR;
+import static org.apache.dolphinscheduler.api.enums.Status.QUERY_PARENT_PROCESS_INSTANCE_DETAIL_INFO_BY_SUB_PROCESS_INSTANCE_ID_ERROR;
+import static org.apache.dolphinscheduler.api.enums.Status.QUERY_PROCESS_INSTANCE_ALL_VARIABLES_ERROR;
+import static org.apache.dolphinscheduler.api.enums.Status.QUERY_PROCESS_INSTANCE_BY_ID_ERROR;
+import static org.apache.dolphinscheduler.api.enums.Status.QUERY_PROCESS_INSTANCE_LIST_PAGING_ERROR;
+import static org.apache.dolphinscheduler.api.enums.Status.QUERY_SUB_PROCESS_INSTANCE_DETAIL_INFO_BY_TASK_ID_ERROR;
+import static org.apache.dolphinscheduler.api.enums.Status.QUERY_TASK_LIST_BY_PROCESS_INSTANCE_ID_ERROR;
+import static org.apache.dolphinscheduler.api.enums.Status.UPDATE_PROCESS_INSTANCE_ERROR;
+
import org.apache.dolphinscheduler.api.aspect.AccessLogAnnotation;
import org.apache.dolphinscheduler.api.enums.Status;
import org.apache.dolphinscheduler.api.exceptions.ApiException;
@@ -26,14 +35,10 @@ import org.apache.dolphinscheduler.api.service.ProcessInstanceService;
import org.apache.dolphinscheduler.api.utils.Result;
import org.apache.dolphinscheduler.common.Constants;
import org.apache.dolphinscheduler.common.enums.WorkflowExecutionStatus;
-import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
import org.apache.dolphinscheduler.dao.entity.User;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.http.HttpStatus;
-import org.springframework.web.bind.annotation.*;
+import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
+
import springfox.documentation.annotations.ApiIgnore;
import org.apache.commons.lang3.StringUtils;
@@ -45,7 +50,26 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
-import static org.apache.dolphinscheduler.api.enums.Status.*;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.http.HttpStatus;
+import org.springframework.web.bind.annotation.DeleteMapping;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestAttribute;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseStatus;
+import org.springframework.web.bind.annotation.RestController;
+
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiImplicitParam;
+import io.swagger.annotations.ApiImplicitParams;
+import io.swagger.annotations.ApiOperation;
+import io.swagger.annotations.ApiParam;
/**
* process instance controller
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProjectController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProjectController.java
index 76997f75dc..14c2cde3ee 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProjectController.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProjectController.java
@@ -32,8 +32,8 @@ import org.apache.dolphinscheduler.api.exceptions.ApiException;
import org.apache.dolphinscheduler.api.service.ProjectService;
import org.apache.dolphinscheduler.api.utils.Result;
import org.apache.dolphinscheduler.common.Constants;
-import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
import org.apache.dolphinscheduler.dao.entity.User;
+import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
import springfox.documentation.annotations.ApiIgnore;
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProjectV2Controller.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProjectV2Controller.java
index 1dd6324a49..b167f9b47e 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProjectV2Controller.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProjectV2Controller.java
@@ -42,8 +42,8 @@ import org.apache.dolphinscheduler.api.exceptions.ApiException;
import org.apache.dolphinscheduler.api.service.ProjectService;
import org.apache.dolphinscheduler.api.utils.Result;
import org.apache.dolphinscheduler.common.Constants;
-import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
import org.apache.dolphinscheduler.dao.entity.User;
+import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
import springfox.documentation.annotations.ApiIgnore;
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/QueueController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/QueueController.java
index 32734e811e..d71760be11 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/QueueController.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/QueueController.java
@@ -27,8 +27,8 @@ import org.apache.dolphinscheduler.api.exceptions.ApiException;
import org.apache.dolphinscheduler.api.service.QueueService;
import org.apache.dolphinscheduler.api.utils.Result;
import org.apache.dolphinscheduler.common.Constants;
-import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
import org.apache.dolphinscheduler.dao.entity.User;
+import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
import springfox.documentation.annotations.ApiIgnore;
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/QueueV2Controller.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/QueueV2Controller.java
index d00f63cb20..ec87292fba 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/QueueV2Controller.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/QueueV2Controller.java
@@ -36,8 +36,10 @@ import org.apache.dolphinscheduler.api.exceptions.ApiException;
import org.apache.dolphinscheduler.api.service.QueueService;
import org.apache.dolphinscheduler.api.utils.Result;
import org.apache.dolphinscheduler.common.Constants;
-import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
import org.apache.dolphinscheduler.dao.entity.User;
+import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
+
+import springfox.documentation.annotations.ApiIgnore;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.http.HttpStatus;
@@ -55,7 +57,6 @@ import io.swagger.annotations.Api;
import io.swagger.annotations.ApiImplicitParam;
import io.swagger.annotations.ApiImplicitParams;
import io.swagger.annotations.ApiOperation;
-import springfox.documentation.annotations.ApiIgnore;
/**
* queue controller
@@ -93,9 +94,9 @@ public class QueueV2Controller extends BaseController {
*/
@ApiOperation(value = "queryQueueListPaging", notes = "QUERY_QUEUE_LIST_PAGING_NOTES")
@ApiImplicitParams({
- @ApiImplicitParam(name = "searchVal", value = "SEARCH_VAL", dataTypeClass = String.class),
- @ApiImplicitParam(name = "pageNo", value = "PAGE_NO", required = true, dataTypeClass = int.class, example = "1"),
- @ApiImplicitParam(name = "pageSize", value = "PAGE_SIZE", required = true, dataTypeClass = int.class, example = "20")
+ @ApiImplicitParam(name = "searchVal", value = "SEARCH_VAL", dataTypeClass = String.class),
+ @ApiImplicitParam(name = "pageNo", value = "PAGE_NO", required = true, dataTypeClass = int.class, example = "1"),
+ @ApiImplicitParam(name = "pageSize", value = "PAGE_SIZE", required = true, dataTypeClass = int.class, example = "20")
})
@GetMapping()
@ResponseStatus(HttpStatus.OK)
@@ -109,7 +110,8 @@ public class QueueV2Controller extends BaseController {
}
String searchVal = ParameterUtils.handleEscapes(queueQueryRequest.getSearchVal());
- result = queueService.queryList(loginUser, searchVal, queueQueryRequest.getPageNo(), queueQueryRequest.getPageSize());
+ result = queueService.queryList(loginUser, searchVal, queueQueryRequest.getPageNo(),
+ queueQueryRequest.getPageSize());
return new QueueListPagingResponse(result);
}
@@ -127,7 +129,8 @@ public class QueueV2Controller extends BaseController {
@AccessLogAnnotation(ignoreRequestArgs = "loginUser")
public QueueCreateResponse createQueue(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
@RequestBody QueueCreateRequest queueCreateRequest) {
- Result result = queueService.createQueue(loginUser, queueCreateRequest.getQueue(), queueCreateRequest.getQueueName());
+ Result result =
+ queueService.createQueue(loginUser, queueCreateRequest.getQueue(), queueCreateRequest.getQueueName());
return new QueueCreateResponse(result);
}
@@ -141,16 +144,17 @@ public class QueueV2Controller extends BaseController {
*/
@ApiOperation(value = "updateQueue", notes = "UPDATE_QUEUE_NOTES")
@ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "QUEUE_ID", required = true, dataTypeClass = int.class, example = "100")
+ @ApiImplicitParam(name = "id", value = "QUEUE_ID", required = true, dataTypeClass = int.class, example = "100")
})
@PutMapping(value = "/{id}", consumes = {"application/json"})
@ResponseStatus(HttpStatus.CREATED)
@ApiException(UPDATE_QUEUE_ERROR)
@AccessLogAnnotation(ignoreRequestArgs = "loginUser")
public QueueUpdateResponse updateQueue(@ApiIgnore @RequestAttribute(value = Constants.SESSION_USER) User loginUser,
- @PathVariable(value = "id") int id, @RequestBody QueueUpdateRequest queueUpdateRequest) {
+ @PathVariable(value = "id") int id,
+ @RequestBody QueueUpdateRequest queueUpdateRequest) {
Result result = queueService.updateQueue(loginUser, id, queueUpdateRequest.getQueue(),
- queueUpdateRequest.getQueueName());
+ queueUpdateRequest.getQueueName());
return new QueueUpdateResponse(result);
}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ResourcesController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ResourcesController.java
index ea2c59c418..55ca04a1a0 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ResourcesController.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ResourcesController.java
@@ -49,8 +49,8 @@ import org.apache.dolphinscheduler.api.utils.Result;
import org.apache.dolphinscheduler.common.Constants;
import org.apache.dolphinscheduler.common.enums.ProgramType;
import org.apache.dolphinscheduler.common.enums.UdfType;
-import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
import org.apache.dolphinscheduler.dao.entity.User;
+import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
import org.apache.dolphinscheduler.spi.enums.ResourceType;
import springfox.documentation.annotations.ApiIgnore;
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/SchedulerController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/SchedulerController.java
index 2f87a1bf00..45a815262d 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/SchedulerController.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/SchedulerController.java
@@ -38,6 +38,7 @@ import org.apache.dolphinscheduler.common.enums.ReleaseState;
import org.apache.dolphinscheduler.common.enums.WarningType;
import org.apache.dolphinscheduler.dao.entity.User;
import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
+
import springfox.documentation.annotations.ApiIgnore;
import java.util.Map;
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TaskDefinitionController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TaskDefinitionController.java
index 301fe085fb..cf96586084 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TaskDefinitionController.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TaskDefinitionController.java
@@ -36,8 +36,8 @@ import org.apache.dolphinscheduler.api.utils.Result;
import org.apache.dolphinscheduler.common.Constants;
import org.apache.dolphinscheduler.common.enums.ReleaseState;
import org.apache.dolphinscheduler.common.enums.TaskExecuteType;
-import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
import org.apache.dolphinscheduler.dao.entity.User;
+import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
import springfox.documentation.annotations.ApiIgnore;
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TaskInstanceController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TaskInstanceController.java
index 9b7b300d4f..78ab34762d 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TaskInstanceController.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TaskInstanceController.java
@@ -28,9 +28,9 @@ import org.apache.dolphinscheduler.api.service.TaskInstanceService;
import org.apache.dolphinscheduler.api.utils.Result;
import org.apache.dolphinscheduler.common.Constants;
import org.apache.dolphinscheduler.common.enums.TaskExecuteType;
-import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
import org.apache.dolphinscheduler.dao.entity.User;
import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus;
+import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
import springfox.documentation.annotations.ApiIgnore;
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TenantController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TenantController.java
index 8c99eb8cfd..c0724b6d34 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TenantController.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TenantController.java
@@ -29,8 +29,8 @@ import org.apache.dolphinscheduler.api.exceptions.ApiException;
import org.apache.dolphinscheduler.api.service.TenantService;
import org.apache.dolphinscheduler.api.utils.Result;
import org.apache.dolphinscheduler.common.Constants;
-import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
import org.apache.dolphinscheduler.dao.entity.User;
+import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
import springfox.documentation.annotations.ApiIgnore;
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/UsersController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/UsersController.java
index 1e427b0e23..44a03483d5 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/UsersController.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/UsersController.java
@@ -39,8 +39,8 @@ import org.apache.dolphinscheduler.api.exceptions.ApiException;
import org.apache.dolphinscheduler.api.service.UsersService;
import org.apache.dolphinscheduler.api.utils.Result;
import org.apache.dolphinscheduler.common.Constants;
-import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
import org.apache.dolphinscheduler.dao.entity.User;
+import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
import springfox.documentation.annotations.ApiIgnore;
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/WorkFlowLineageController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/WorkFlowLineageController.java
index f887f064b7..b22eda9eae 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/WorkFlowLineageController.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/WorkFlowLineageController.java
@@ -28,9 +28,9 @@ import org.apache.dolphinscheduler.api.exceptions.ServiceException;
import org.apache.dolphinscheduler.api.service.WorkFlowLineageService;
import org.apache.dolphinscheduler.api.utils.Result;
import org.apache.dolphinscheduler.common.Constants;
-import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
import org.apache.dolphinscheduler.dao.entity.User;
import org.apache.dolphinscheduler.dao.entity.WorkFlowLineage;
+import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
import springfox.documentation.annotations.ApiIgnore;
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/WorkerGroupController.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/WorkerGroupController.java
index 7314a38eed..58681aed85 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/WorkerGroupController.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/WorkerGroupController.java
@@ -27,8 +27,8 @@ import org.apache.dolphinscheduler.api.exceptions.ApiException;
import org.apache.dolphinscheduler.api.service.WorkerGroupService;
import org.apache.dolphinscheduler.api.utils.Result;
import org.apache.dolphinscheduler.common.Constants;
-import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
import org.apache.dolphinscheduler.dao.entity.User;
+import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
import springfox.documentation.annotations.ApiIgnore;
@@ -73,11 +73,11 @@ public class WorkerGroupController extends BaseController {
*/
@ApiOperation(value = "saveWorkerGroup", notes = "CREATE_WORKER_GROUP_NOTES")
@ApiImplicitParams({
- @ApiImplicitParam(name = "id", value = "WORKER_GROUP_ID", dataType = "Int", example = "10", defaultValue = "0"),
- @ApiImplicitParam(name = "name", value = "WORKER_GROUP_NAME", required = true, dataType = "String"),
- @ApiImplicitParam(name = "addrList", value = "WORKER_ADDR_LIST", required = true, dataType = "String"),
- @ApiImplicitParam(name = "description", value = "WORKER_DESC", required = false, dataType = "String"),
- @ApiImplicitParam(name = "otherParamsJson", value = "WORKER_PARMS_JSON", required = false, dataType = "String"),
+ @ApiImplicitParam(name = "id", value = "WORKER_GROUP_ID", dataType = "Int", example = "10", defaultValue = "0"),
+ @ApiImplicitParam(name = "name", value = "WORKER_GROUP_NAME", required = true, dataType = "String"),
+ @ApiImplicitParam(name = "addrList", value = "WORKER_ADDR_LIST", required = true, dataType = "String"),
+ @ApiImplicitParam(name = "description", value = "WORKER_DESC", required = false, dataType = "String"),
+ @ApiImplicitParam(name = "otherParamsJson", value = "WORKER_PARMS_JSON", required = false, dataType = "String"),
})
@PostMapping()
@ResponseStatus(HttpStatus.OK)
@@ -87,10 +87,10 @@ public class WorkerGroupController extends BaseController {
@RequestParam(value = "id", required = false, defaultValue = "0") int id,
@RequestParam(value = "name") String name,
@RequestParam(value = "addrList") String addrList,
- @RequestParam(value = "description",required = false, defaultValue = "") String description,
- @RequestParam(value = "otherParamsJson",required = false, defaultValue = "") String otherParamsJson
- ) {
- Map<String, Object> result = workerGroupService.saveWorkerGroup(loginUser, id, name, addrList, description, otherParamsJson);
+ @RequestParam(value = "description", required = false, defaultValue = "") String description,
+ @RequestParam(value = "otherParamsJson", required = false, defaultValue = "") String otherParamsJson) {
+ Map<String, Object> result =
+ workerGroupService.saveWorkerGroup(loginUser, id, name, addrList, description, otherParamsJson);
return returnDataList(result);
}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/CommandStateCount.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/CommandStateCount.java
index 5e6a518173..b1b0eb66c9 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/CommandStateCount.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/CommandStateCount.java
@@ -28,7 +28,8 @@ public class CommandStateCount {
private int normalCount;
private CommandType commandState;
- public CommandStateCount(){}
+ public CommandStateCount() {
+ }
public CommandStateCount(int errorCount, int normalCount, CommandType commandState) {
this.errorCount = errorCount;
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/CreateTokenRequest.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/CreateTokenRequest.java
index 03190f4b9f..c0b8520e2e 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/CreateTokenRequest.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/CreateTokenRequest.java
@@ -17,10 +17,10 @@
package org.apache.dolphinscheduler.api.dto;
-
import io.swagger.annotations.ApiModelProperty;
public class CreateTokenRequest {
+
@ApiModelProperty(example = "1", required = true)
Integer userId;
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/CreateTokenResponse.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/CreateTokenResponse.java
index e96e2b2690..d7fa93c40c 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/CreateTokenResponse.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/CreateTokenResponse.java
@@ -21,6 +21,7 @@ import org.apache.dolphinscheduler.api.utils.Result;
import org.apache.dolphinscheduler.dao.entity.AccessToken;
public class CreateTokenResponse extends Result {
+
private AccessToken data;
public CreateTokenResponse(Result result) {
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/RuleDefinition.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/RuleDefinition.java
index d702e88b48..2ef0f11cbd 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/RuleDefinition.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/RuleDefinition.java
@@ -40,7 +40,7 @@ public class RuleDefinition {
public RuleDefinition() {
}
- public RuleDefinition(List<DqRuleInputEntry> ruleInputEntryList,List<DqRuleExecuteSql> executeSqlList) {
+ public RuleDefinition(List<DqRuleInputEntry> ruleInputEntryList, List<DqRuleExecuteSql> executeSqlList) {
this.ruleInputEntryList = ruleInputEntryList;
this.executeSqlList = executeSqlList;
}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/TaskCountDto.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/TaskCountDto.java
index 66a42857a4..9e456109be 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/TaskCountDto.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/TaskCountDto.java
@@ -17,9 +17,6 @@
package org.apache.dolphinscheduler.api.dto;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.NoArgsConstructor;
import org.apache.dolphinscheduler.dao.entity.ExecuteStatusCount;
import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus;
@@ -28,10 +25,15 @@ import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
@Data
@NoArgsConstructor
@AllArgsConstructor
public class TaskCountDto {
+
/**
* total count
*/
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/TaskStateCount.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/TaskStateCount.java
index 95dc18a49f..eb935659c9 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/TaskStateCount.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/TaskStateCount.java
@@ -17,10 +17,11 @@
package org.apache.dolphinscheduler.api.dto;
+import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus;
+
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
-import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus;
@Data
@NoArgsConstructor
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/gantt/GanttDto.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/gantt/GanttDto.java
index c32454a784..401e3f6319 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/gantt/GanttDto.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/gantt/GanttDto.java
@@ -44,14 +44,13 @@ public class GanttDto {
/**
* task status map
*/
- private Map<String,String> taskStatus;
+ private Map<String, String> taskStatus;
-
- public GanttDto(){
+ public GanttDto() {
this.taskStatus = new HashMap<>();
- taskStatus.put("success","success");
+ taskStatus.put("success", "success");
}
- public GanttDto(int height, List<Task> tasks, List<String> taskNames){
+ public GanttDto(int height, List<Task> tasks, List<String> taskNames) {
this();
this.height = height;
this.tasks = tasks;
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/gantt/Task.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/gantt/Task.java
index 07243db3fd..5370f61e8a 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/gantt/Task.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/gantt/Task.java
@@ -25,6 +25,7 @@ import java.util.List;
* Task
*/
public class Task {
+
/**
* task name
*/
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/project/ProjectCreateRequest.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/project/ProjectCreateRequest.java
index aca6556db4..21ad4d75be 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/project/ProjectCreateRequest.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/project/ProjectCreateRequest.java
@@ -17,8 +17,8 @@
package org.apache.dolphinscheduler.api.dto.project;
-import io.swagger.annotations.ApiModelProperty;
import lombok.Data;
+import io.swagger.annotations.ApiModelProperty;
/**
* project create request
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/project/ProjectDeleteResponse.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/project/ProjectDeleteResponse.java
index a7ee4bd97b..b174adda84 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/project/ProjectDeleteResponse.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/project/ProjectDeleteResponse.java
@@ -35,4 +35,4 @@ public class ProjectDeleteResponse extends Result {
this.setMsg(result.getMsg());
this.setData((Boolean) result.getData());
}
-}
\ No newline at end of file
+}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/project/ProjectQueryRequest.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/project/ProjectQueryRequest.java
index 2512650a73..942be6857d 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/project/ProjectQueryRequest.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/project/ProjectQueryRequest.java
@@ -19,12 +19,13 @@ package org.apache.dolphinscheduler.api.dto.project;
import org.apache.dolphinscheduler.api.dto.PageQueryDto;
+import lombok.Data;
+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
/**
* project query request
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/project/ProjectUpdateRequest.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/project/ProjectUpdateRequest.java
index 32e36ac95a..69cb3b563c 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/project/ProjectUpdateRequest.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/project/ProjectUpdateRequest.java
@@ -17,11 +17,11 @@
package org.apache.dolphinscheduler.api.dto.project;
+import lombok.Data;
+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
-
import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
/**
* project update request
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/queue/QueueCreateRequest.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/queue/QueueCreateRequest.java
index 702826fe32..c318200f5a 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/queue/QueueCreateRequest.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/queue/QueueCreateRequest.java
@@ -17,9 +17,9 @@
package org.apache.dolphinscheduler.api.dto.queue;
+import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
/**
* queue create request
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/queue/QueueQueryRequest.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/queue/QueueQueryRequest.java
index 727d8b12c6..3bdd2293cf 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/queue/QueueQueryRequest.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/queue/QueueQueryRequest.java
@@ -19,12 +19,13 @@ package org.apache.dolphinscheduler.api.dto.queue;
import org.apache.dolphinscheduler.api.dto.PageQueryDto;
+import lombok.Data;
+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
/**
* queue query request
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/queue/QueueUpdateRequest.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/queue/QueueUpdateRequest.java
index fd04318a03..7d2bbdc42f 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/queue/QueueUpdateRequest.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/queue/QueueUpdateRequest.java
@@ -17,12 +17,13 @@
package org.apache.dolphinscheduler.api.dto.queue;
+import lombok.Data;
+
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
import com.fasterxml.jackson.annotation.JsonInclude;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
/**
* queue update request
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/queue/QueueVerifyRequest.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/queue/QueueVerifyRequest.java
index 88e5359843..6b07a7bb7d 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/queue/QueueVerifyRequest.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/queue/QueueVerifyRequest.java
@@ -17,9 +17,9 @@
package org.apache.dolphinscheduler.api.dto.queue;
+import lombok.Data;
import io.swagger.annotations.ApiModel;
import io.swagger.annotations.ApiModelProperty;
-import lombok.Data;
/**
* queue verify request
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/resources/FileLeaf.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/resources/FileLeaf.java
index 92aaf13320..bee5bc8590 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/resources/FileLeaf.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/resources/FileLeaf.java
@@ -19,6 +19,6 @@ package org.apache.dolphinscheduler.api.dto.resources;
/**
* file leaf
*/
-public class FileLeaf extends ResourceComponent{
+public class FileLeaf extends ResourceComponent {
}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/resources/filter/IFilter.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/resources/filter/IFilter.java
index ce6ce3a011..2bcc2822a8 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/resources/filter/IFilter.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/resources/filter/IFilter.java
@@ -24,5 +24,6 @@ import java.util.List;
* interface filter
*/
public interface IFilter {
+
List<Resource> filter();
}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/resources/filter/ResourceFilter.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/resources/filter/ResourceFilter.java
index bf5a49597c..6206769f7f 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/resources/filter/ResourceFilter.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/resources/filter/ResourceFilter.java
@@ -28,6 +28,7 @@ import java.util.stream.Collectors;
* resource filter
*/
public class ResourceFilter implements IFilter {
+
/**
* resource suffix
*/
@@ -40,7 +41,7 @@ public class ResourceFilter implements IFilter {
/**
* parent list
*/
- //Set<Resource> parentList = new HashSet<>();
+ // Set<Resource> parentList = new HashSet<>();
/**
* constructor
@@ -56,7 +57,7 @@ public class ResourceFilter implements IFilter {
* file filter
* @return file filtered by suffix
*/
- public Set<Resource> fileFilter(){
+ public Set<Resource> fileFilter() {
return resourceList.stream().filter(t -> {
String alias = t.getAlias();
return alias.endsWith(suffix);
@@ -67,12 +68,12 @@ public class ResourceFilter implements IFilter {
* list all parent dir
* @return parent resource dir set
*/
- Set<Resource> listAllParent(){
- Set<Resource> parentList = new HashSet<>();
+ Set<Resource> listAllParent() {
+ Set<Resource> parentList = new HashSet<>();
Set<Resource> filterFileList = fileFilter();
- for(Resource file:filterFileList){
+ for (Resource file : filterFileList) {
parentList.add(file);
- setAllParent(file,parentList);
+ setAllParent(file, parentList);
}
return parentList;
@@ -83,11 +84,11 @@ public class ResourceFilter implements IFilter {
* @param resource resource
* @return parent resource dir set
*/
- private void setAllParent(Resource resource,Set<Resource> parentList){
+ private void setAllParent(Resource resource, Set<Resource> parentList) {
for (Resource resourceTemp : resourceList) {
if (resourceTemp.getId() == resource.getPid()) {
parentList.add(resourceTemp);
- setAllParent(resourceTemp,parentList);
+ setAllParent(resourceTemp, parentList);
}
}
}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/resources/visitor/ResourceTreeVisitor.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/resources/visitor/ResourceTreeVisitor.java
index 391822e535..5b84fde1a5 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/resources/visitor/ResourceTreeVisitor.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/resources/visitor/ResourceTreeVisitor.java
@@ -16,7 +16,6 @@
*/
package org.apache.dolphinscheduler.api.dto.resources.visitor;
-
import org.apache.dolphinscheduler.api.dto.resources.Directory;
import org.apache.dolphinscheduler.api.dto.resources.FileLeaf;
import org.apache.dolphinscheduler.api.dto.resources.ResourceComponent;
@@ -28,7 +27,7 @@ import java.util.List;
/**
* resource tree visitor
*/
-public class ResourceTreeVisitor implements Visitor{
+public class ResourceTreeVisitor implements Visitor {
/**
* resource list
@@ -55,10 +54,10 @@ public class ResourceTreeVisitor implements Visitor{
ResourceComponent rootDirectory = new Directory();
for (Resource resource : resourceList) {
// judge whether is root node
- if (rootNode(resource)){
+ if (rootNode(resource)) {
ResourceComponent tempResourceComponent = getResourceComponent(resource);
rootDirectory.add(tempResourceComponent);
- tempResourceComponent.setChildren(setChildren(tempResourceComponent.getId(),resourceList));
+ tempResourceComponent.setChildren(setChildren(tempResourceComponent.getId(), resourceList));
}
}
return rootDirectory;
@@ -70,18 +69,18 @@ public class ResourceTreeVisitor implements Visitor{
* @param list resource list
* @return resource component list
*/
- public static List<ResourceComponent> setChildren(int id, List<Resource> list ){
+ public static List<ResourceComponent> setChildren(int id, List<Resource> list) {
List<ResourceComponent> childList = new ArrayList<>();
for (Resource resource : list) {
- if (id == resource.getPid()){
+ if (id == resource.getPid()) {
ResourceComponent tempResourceComponent = getResourceComponent(resource);
childList.add(tempResourceComponent);
}
}
for (ResourceComponent resourceComponent : childList) {
- resourceComponent.setChildren(setChildren(resourceComponent.getId(),list));
+ resourceComponent.setChildren(setChildren(resourceComponent.getId(), list));
}
- if (childList.size()==0){
+ if (childList.size() == 0) {
return new ArrayList<>();
}
return childList;
@@ -95,7 +94,7 @@ public class ResourceTreeVisitor implements Visitor{
public boolean rootNode(Resource resource) {
boolean isRootNode = true;
- if(resource.getPid() != -1 ){
+ if (resource.getPid() != -1) {
for (Resource parent : resourceList) {
if (resource.getPid() == parent.getId()) {
isRootNode = false;
@@ -113,17 +112,17 @@ public class ResourceTreeVisitor implements Visitor{
*/
private static ResourceComponent getResourceComponent(Resource resource) {
ResourceComponent tempResourceComponent;
- if(resource.isDirectory()){
+ if (resource.isDirectory()) {
tempResourceComponent = new Directory();
- }else{
+ } else {
tempResourceComponent = new FileLeaf();
}
-
+
tempResourceComponent.setName(resource.getAlias());
- tempResourceComponent.setFullName(resource.getFullName().replaceFirst("/",""));
+ tempResourceComponent.setFullName(resource.getFullName().replaceFirst("/", ""));
tempResourceComponent.setId(resource.getId());
tempResourceComponent.setPid(resource.getPid());
- tempResourceComponent.setIdValue(resource.getId(),resource.isDirectory());
+ tempResourceComponent.setIdValue(resource.getId(), resource.isDirectory());
tempResourceComponent.setDescription(resource.getDescription());
tempResourceComponent.setType(resource.getType());
return tempResourceComponent;
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/resources/visitor/Visitor.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/resources/visitor/Visitor.java
index defbed13bb..382bcc5e16 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/resources/visitor/Visitor.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/resources/visitor/Visitor.java
@@ -23,6 +23,7 @@ import org.apache.dolphinscheduler.api.dto.resources.ResourceComponent;
* Visitor
*/
public interface Visitor {
+
/**
* visit
* @return resource component
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/schedule/ScheduleCreateRequest.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/schedule/ScheduleCreateRequest.java
index ff42d75845..f324c23c5a 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/schedule/ScheduleCreateRequest.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/dto/schedule/ScheduleCreateRequest.java
@@ -33,9 +33,6 @@ import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import io.swagger.annotations.ApiModelProperty;
-import com.google.gson.Gson;
-import com.google.gson.GsonBuilder;
-
/**
* schedule create request
*/
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/ExecuteType.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/ExecuteType.java
index bfac404582..755daa1dd1 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/ExecuteType.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/ExecuteType.java
@@ -33,7 +33,7 @@ public enum ExecuteType {
NONE, REPEAT_RUNNING, RECOVER_SUSPENDED_PROCESS, START_FAILURE_TASK_PROCESS, STOP, PAUSE;
public static ExecuteType getEnum(int value) {
- for (ExecuteType e: ExecuteType.values()) {
+ for (ExecuteType e : ExecuteType.values()) {
if (e.ordinal() == value) {
return e;
}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/exceptions/ApiException.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/exceptions/ApiException.java
index 8cdf2b81f8..b4812a0307 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/exceptions/ApiException.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/exceptions/ApiException.java
@@ -31,5 +31,6 @@ import java.lang.annotation.Target;
@Retention(RUNTIME)
@Target(METHOD)
public @interface ApiException {
+
Status value();
}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/exceptions/ApiExceptionHandler.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/exceptions/ApiExceptionHandler.java
index e1d5a47138..863ad79a06 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/exceptions/ApiExceptionHandler.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/exceptions/ApiExceptionHandler.java
@@ -55,4 +55,3 @@ public class ApiExceptionHandler {
}
}
-
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/interceptor/RateLimitInterceptor.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/interceptor/RateLimitInterceptor.java
index 20041b64d4..19f121fff2 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/interceptor/RateLimitInterceptor.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/interceptor/RateLimitInterceptor.java
@@ -56,13 +56,15 @@ public class RateLimitInterceptor implements HandlerInterceptor {
.maximumSize(100)
.expireAfterAccess(10, TimeUnit.MINUTES)
.build(new CacheLoader<String, RateLimiter>() {
+
@Override
public RateLimiter load(String token) {
// use tenant customize rate limit
Map<String, Integer> customizeTenantQpsRate = trafficConfiguration.getCustomizeTenantQpsRate();
int tenantQuota = trafficConfiguration.getDefaultTenantQpsRate();
if (MapUtils.isNotEmpty(customizeTenantQpsRate)) {
- tenantQuota = customizeTenantQpsRate.getOrDefault(token, trafficConfiguration.getDefaultTenantQpsRate());
+ tenantQuota = customizeTenantQpsRate.getOrDefault(token,
+ trafficConfiguration.getDefaultTenantQpsRate());
}
// use tenant default rate limit
return RateLimiter.create(tenantQuota, 1, TimeUnit.SECONDS);
@@ -70,7 +72,8 @@ public class RateLimitInterceptor implements HandlerInterceptor {
});
@Override
- public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws ExecutionException {
+ public boolean preHandle(HttpServletRequest request, HttpServletResponse response,
+ Object handler) throws ExecutionException {
// tenant-level rate limit
if (trafficConfiguration.isTenantSwitch()) {
String token = request.getHeader("token");
@@ -78,7 +81,8 @@ public class RateLimitInterceptor implements HandlerInterceptor {
RateLimiter tenantRateLimiter = tenantRateLimiterCache.get(token);
if (!tenantRateLimiter.tryAcquire()) {
response.setStatus(HttpStatus.TOO_MANY_REQUESTS.value());
- logger.warn("Too many request, reach tenant rate limit, current tenant:{} qps is {}", token, tenantRateLimiter.getRate());
+ logger.warn("Too many request, reach tenant rate limit, current tenant:{} qps is {}", token,
+ tenantRateLimiter.getRate());
return false;
}
}
@@ -87,7 +91,8 @@ public class RateLimitInterceptor implements HandlerInterceptor {
if (trafficConfiguration.isGlobalSwitch()) {
if (!globalRateLimiter.tryAcquire()) {
response.setStatus(HttpStatus.TOO_MANY_REQUESTS.value());
- logger.warn("Too many request, reach global rate limit, current qps is {}", globalRateLimiter.getRate());
+ logger.warn("Too many request, reach global rate limit, current qps is {}",
+ globalRateLimiter.getRate());
return false;
}
}
@@ -97,7 +102,8 @@ public class RateLimitInterceptor implements HandlerInterceptor {
public RateLimitInterceptor(TrafficConfiguration trafficConfiguration) {
this.trafficConfiguration = trafficConfiguration;
if (trafficConfiguration.isGlobalSwitch()) {
- this.globalRateLimiter = RateLimiter.create(trafficConfiguration.getMaxGlobalQpsRate(), 1, TimeUnit.SECONDS);
+ this.globalRateLimiter =
+ RateLimiter.create(trafficConfiguration.getMaxGlobalQpsRate(), 1, TimeUnit.SECONDS);
}
}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/k8s/K8sClientService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/k8s/K8sClientService.java
index dcfc6e734a..393f440ee4 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/k8s/K8sClientService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/k8s/K8sClientService.java
@@ -42,7 +42,8 @@ public class K8sClientService {
@Autowired
private K8sManager k8sManager;
- public ResourceQuota upsertNamespaceAndResourceToK8s(K8sNamespace k8sNamespace, String yamlStr) throws RemotingException {
+ public ResourceQuota upsertNamespaceAndResourceToK8s(K8sNamespace k8sNamespace,
+ String yamlStr) throws RemotingException {
upsertNamespaceToK8s(k8sNamespace.getNamespace(), k8sNamespace.getClusterCode());
return upsertNamespacedResourceToK8s(k8sNamespace, yamlStr);
}
@@ -61,48 +62,48 @@ public class K8sClientService {
return getNamespaceFromK8s(name, clusterCode);
}
- private ResourceQuota upsertNamespacedResourceToK8s(K8sNamespace k8sNamespace, String yamlStr) throws RemotingException {
+ private ResourceQuota upsertNamespacedResourceToK8s(K8sNamespace k8sNamespace,
+ String yamlStr) throws RemotingException {
KubernetesClient client = k8sManager.getK8sClient(k8sNamespace.getClusterCode());
- //创建资源
+ // 创建资源
ResourceQuota queryExist = client.resourceQuotas()
- .inNamespace(k8sNamespace.getNamespace())
- .withName(k8sNamespace.getNamespace())
- .get();
+ .inNamespace(k8sNamespace.getNamespace())
+ .withName(k8sNamespace.getNamespace())
+ .get();
ResourceQuota body = yaml.loadAs(yamlStr, ResourceQuota.class);
if (queryExist != null) {
if (k8sNamespace.getLimitsCpu() == null && k8sNamespace.getLimitsMemory() == null) {
client.resourceQuotas().inNamespace(k8sNamespace.getNamespace())
- .withName(k8sNamespace.getNamespace())
- .delete();
+ .withName(k8sNamespace.getNamespace())
+ .delete();
return null;
}
}
return client.resourceQuotas().inNamespace(k8sNamespace.getNamespace())
- .withName(k8sNamespace.getNamespace())
- .createOrReplace(body);
+ .withName(k8sNamespace.getNamespace())
+ .createOrReplace(body);
}
private Optional<Namespace> getNamespaceFromK8s(String name, Long clusterCode) throws RemotingException {
NamespaceList listNamespace =
- k8sManager.getK8sClient(clusterCode).namespaces().list();
+ k8sManager.getK8sClient(clusterCode).namespaces().list();
Optional<Namespace> list =
- listNamespace.getItems().stream()
- .filter((Namespace namespace) ->
- namespace.getMetadata().getName().equals(name))
- .findFirst();
+ listNamespace.getItems().stream()
+ .filter((Namespace namespace) -> namespace.getMetadata().getName().equals(name))
+ .findFirst();
return list;
}
private Namespace upsertNamespaceToK8s(String name, Long clusterCode) throws RemotingException {
Optional<Namespace> result = getNamespaceFromK8s(name, clusterCode);
- //if not exist create
+ // if not exist create
if (!result.isPresent()) {
KubernetesClient client = k8sManager.getK8sClient(clusterCode);
Namespace body = new Namespace();
@@ -115,4 +116,4 @@ public class K8sClientService {
return result.get();
}
-}
\ No newline at end of file
+}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/k8s/K8sManager.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/k8s/K8sManager.java
index fd9a249328..422075cbd7 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/k8s/K8sManager.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/k8s/K8sManager.java
@@ -67,7 +67,8 @@ public class K8sManager {
* @param clusterCode
* @return new client if need updated
*/
- public synchronized KubernetesClient getAndUpdateK8sClient(Long clusterCode, boolean update) throws RemotingException {
+ public synchronized KubernetesClient getAndUpdateK8sClient(Long clusterCode,
+ boolean update) throws RemotingException {
if (null == clusterCode) {
return null;
}
@@ -84,7 +85,6 @@ public class K8sManager {
return clientMap.get(clusterCode);
}
-
private void deleteK8sClientInner(Long clusterCode) {
if (clusterCode == null) {
return;
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/PermissionCheck.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/PermissionCheck.java
index 41d69e590e..3d2e42b81b 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/PermissionCheck.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/PermissionCheck.java
@@ -31,6 +31,7 @@ import java.util.List;
import org.slf4j.Logger;
public class PermissionCheck<T> {
+
/**
* logger
*/
@@ -74,7 +75,8 @@ public class PermissionCheck<T> {
/**
* permission check
*/
- public PermissionCheck(AuthorizationType authorizationType, ProcessService processService, T[] needChecks, int userId) {
+ public PermissionCheck(AuthorizationType authorizationType, ProcessService processService, T[] needChecks,
+ int userId) {
this.authorizationType = authorizationType;
this.processService = processService;
this.needChecks = needChecks;
@@ -84,7 +86,8 @@ public class PermissionCheck<T> {
/**
* permission check
*/
- public PermissionCheck(AuthorizationType authorizationType, ProcessService processService, T[] needChecks, int userId, Logger logger) {
+ public PermissionCheck(AuthorizationType authorizationType, ProcessService processService, T[] needChecks,
+ int userId, Logger logger) {
this.authorizationType = authorizationType;
this.processService = processService;
this.needChecks = needChecks;
@@ -95,7 +98,8 @@ public class PermissionCheck<T> {
/**
* permission check
*/
- public PermissionCheck(AuthorizationType authorizationType, ProcessService processService, List<ResourceInfo> resourceList, int userId, Logger logger) {
+ public PermissionCheck(AuthorizationType authorizationType, ProcessService processService,
+ List<ResourceInfo> resourceList, int userId, Logger logger) {
this.authorizationType = authorizationType;
this.processService = processService;
this.resourceList = resourceList;
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckService.java
index eea1f14f98..b8016c5926 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckService.java
@@ -16,13 +16,13 @@
*/
package org.apache.dolphinscheduler.api.permission;
-import org.apache.dolphinscheduler.common.enums.AuthorizationType;
-import org.slf4j.Logger;
-
import java.util.List;
import java.util.Set;
-public interface ResourcePermissionCheckService<T>{
+import org.slf4j.Logger;
+
+public interface ResourcePermissionCheckService<T> {
+
/**
* resourcePermissionCheck
* @param authorizationType
@@ -51,7 +51,8 @@ public interface ResourcePermissionCheckService<T>{
* @param logger
* @return
*/
- boolean operationPermissionCheck(Object authorizationType, Object[] projectIds, Integer userId, String permissionKey, Logger logger);
+ boolean operationPermissionCheck(Object authorizationType, Object[] projectIds, Integer userId,
+ String permissionKey, Logger logger);
/**
* functionDisabled
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckServiceImpl.java
index 1ebd187369..49c35242b2 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/permission/ResourcePermissionCheckServiceImpl.java
@@ -35,7 +35,6 @@ package org.apache.dolphinscheduler.api.permission;
import static java.util.stream.Collectors.toSet;
-import org.apache.commons.collections.CollectionUtils;
import org.apache.dolphinscheduler.common.enums.AuthorizationType;
import org.apache.dolphinscheduler.common.enums.UserType;
import org.apache.dolphinscheduler.dao.entity.AccessToken;
@@ -52,9 +51,7 @@ import org.apache.dolphinscheduler.dao.entity.User;
import org.apache.dolphinscheduler.dao.mapper.AccessTokenMapper;
import org.apache.dolphinscheduler.dao.mapper.AlertGroupMapper;
import org.apache.dolphinscheduler.dao.mapper.AlertPluginInstanceMapper;
-import org.apache.dolphinscheduler.dao.mapper.CommandMapper;
import org.apache.dolphinscheduler.dao.mapper.DataSourceMapper;
-import org.apache.dolphinscheduler.dao.mapper.DqRuleMapper;
import org.apache.dolphinscheduler.dao.mapper.EnvironmentMapper;
import org.apache.dolphinscheduler.dao.mapper.K8sNamespaceMapper;
import org.apache.dolphinscheduler.dao.mapper.ProjectMapper;
@@ -67,6 +64,8 @@ import org.apache.dolphinscheduler.dao.mapper.UdfFuncMapper;
import org.apache.dolphinscheduler.dao.mapper.WorkerGroupMapper;
import org.apache.dolphinscheduler.service.process.ProcessService;
+import org.apache.commons.collections.CollectionUtils;
+
import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collections;
@@ -86,23 +85,29 @@ import org.springframework.context.ApplicationContextAware;
import org.springframework.stereotype.Component;
@Component
-public class ResourcePermissionCheckServiceImpl implements ResourcePermissionCheckService<Object>, ApplicationContextAware {
+public class ResourcePermissionCheckServiceImpl
+ implements
+ ResourcePermissionCheckService<Object>,
+ ApplicationContextAware {
@Autowired
private ProcessService processService;
- public static final Map<AuthorizationType, ResourceAcquisitionAndPermissionCheck<?>> RESOURCE_LIST_MAP = new ConcurrentHashMap<>();
+ public static final Map<AuthorizationType, ResourceAcquisitionAndPermissionCheck<?>> RESOURCE_LIST_MAP =
+ new ConcurrentHashMap<>();
@Override
public void setApplicationContext(ApplicationContext applicationContext) throws BeansException {
- for (ResourceAcquisitionAndPermissionCheck<?> authorizedResourceList : applicationContext.getBeansOfType(ResourceAcquisitionAndPermissionCheck.class).values()) {
+ for (ResourceAcquisitionAndPermissionCheck<?> authorizedResourceList : applicationContext
+ .getBeansOfType(ResourceAcquisitionAndPermissionCheck.class).values()) {
List<AuthorizationType> authorizationTypes = authorizedResourceList.authorizationTypes();
authorizationTypes.forEach(auth -> RESOURCE_LIST_MAP.put(auth, authorizedResourceList));
}
- }
+ }
@Override
- public boolean resourcePermissionCheck(Object authorizationType, Object[] needChecks, Integer userId, Logger logger) {
+ public boolean resourcePermissionCheck(Object authorizationType, Object[] needChecks, Integer userId,
+ Logger logger) {
if (Objects.nonNull(needChecks) && needChecks.length > 0) {
Set<?> originResSet = new HashSet<>(Arrays.asList(needChecks));
Set<?> ownResSets = RESOURCE_LIST_MAP.get(authorizationType).listAuthorizedResource(userId, logger);
@@ -115,7 +120,8 @@ public class ResourcePermissionCheckServiceImpl implements ResourcePermissionChe
}
@Override
- public boolean operationPermissionCheck(Object authorizationType, Object[] projectIds, Integer userId, String permissionKey, Logger logger) {
+ public boolean operationPermissionCheck(Object authorizationType, Object[] projectIds, Integer userId,
+ String permissionKey, Logger logger) {
User user = processService.getUserById(userId);
if (user == null) {
logger.error("User does not exist, userId:{}.", userId);
@@ -229,7 +235,8 @@ public class ResourcePermissionCheckServiceImpl implements ResourcePermissionChe
} else {
// query resource relation
List<Integer> resIds = resourceUserMapper.queryResourcesIdListByUserIdAndPerm(userId, 0);
- relationResources = CollectionUtils.isEmpty(resIds) ? new ArrayList<>() : resourceMapper.queryResourceListById(resIds);
+ relationResources = CollectionUtils.isEmpty(resIds) ? new ArrayList<>()
+ : resourceMapper.queryResourceListById(resIds);
}
List<Resource> ownResourceList = resourceMapper.queryResourceListAuthored(userId, -1);
relationResources.addAll(ownResourceList);
@@ -259,7 +266,7 @@ public class ResourcePermissionCheckServiceImpl implements ResourcePermissionChe
@Override
public Set<Integer> listAuthorizedResource(int userId, Logger logger) {
List<UdfFunc> udfFuncList = udfFuncMapper.listAuthorizedUdfByUserId(userId);
- if (udfFuncList.isEmpty()){
+ if (udfFuncList.isEmpty()) {
return Collections.emptySet();
}
return udfFuncList.stream().map(UdfFunc::getId).collect(toSet());
@@ -325,7 +332,6 @@ public class ResourcePermissionCheckServiceImpl implements ResourcePermissionChe
}
}
-
@Component
public static class EnvironmentResourceList implements ResourceAcquisitionAndPermissionCheck<Integer> {
@@ -342,7 +348,7 @@ public class ResourcePermissionCheckServiceImpl implements ResourcePermissionChe
@Override
public boolean permissionCheck(int userId, String url, Logger logger) {
- return true;
+ return true;
}
@Override
@@ -374,7 +380,6 @@ public class ResourcePermissionCheckServiceImpl implements ResourcePermissionChe
return false;
}
-
@Override
public Set<Integer> listAuthorizedResource(int userId, Logger logger) {
return Collections.emptySet();
@@ -403,7 +408,6 @@ public class ResourcePermissionCheckServiceImpl implements ResourcePermissionChe
return false;
}
-
@Override
public Set<Integer> listAuthorizedResource(int userId, Logger logger) {
return Collections.emptySet();
@@ -429,10 +433,9 @@ public class ResourcePermissionCheckServiceImpl implements ResourcePermissionChe
@Override
public boolean permissionCheck(int userId, String url, Logger logger) {
- return false;
+ return false;
}
-
@Override
public Set<Integer> listAuthorizedResource(int userId, Logger logger) {
List<AlertGroup> alertGroupList = alertGroupMapper.queryAllGroupList();
@@ -462,7 +465,6 @@ public class ResourcePermissionCheckServiceImpl implements ResourcePermissionChe
return false;
}
-
@Override
public Set<Integer> listAuthorizedResource(int userId, Logger logger) {
if (userId != 0) {
@@ -495,10 +497,10 @@ public class ResourcePermissionCheckServiceImpl implements ResourcePermissionChe
return true;
}
-
@Override
public Set<Integer> listAuthorizedResource(int userId, Logger logger) {
- return dataSourceMapper.listAuthorizedDataSource(userId, null).stream().map(DataSource::getId).collect(toSet());
+ return dataSourceMapper.listAuthorizedDataSource(userId, null).stream().map(DataSource::getId)
+ .collect(toSet());
}
}
@@ -526,11 +528,11 @@ public class ResourcePermissionCheckServiceImpl implements ResourcePermissionChe
@Override
public Set<Integer> listAuthorizedResource(int userId, Logger logger) {
- return accessTokenMapper.listAuthorizedAccessToken(userId, null).stream().map(AccessToken::getId).collect(toSet());
+ return accessTokenMapper.listAuthorizedAccessToken(userId, null).stream().map(AccessToken::getId)
+ .collect(toSet());
}
}
-
interface ResourceAcquisitionAndPermissionCheck<T> {
/**
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/python/PythonGateway.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/python/PythonGateway.java
index 89fcc5fcf3..c465c3f9fd 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/python/PythonGateway.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/python/PythonGateway.java
@@ -17,19 +17,6 @@
package org.apache.dolphinscheduler.api.python;
-import java.io.IOException;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
-import java.util.Collections;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.stream.Collectors;
-
-import javax.annotation.PostConstruct;
-
-import org.apache.commons.collections.CollectionUtils;
import org.apache.dolphinscheduler.api.configuration.PythonGatewayConfiguration;
import org.apache.dolphinscheduler.api.dto.EnvironmentDto;
import org.apache.dolphinscheduler.api.dto.resources.ResourceComponent;
@@ -45,7 +32,6 @@ import org.apache.dolphinscheduler.api.service.TenantService;
import org.apache.dolphinscheduler.api.service.UsersService;
import org.apache.dolphinscheduler.api.utils.Result;
import org.apache.dolphinscheduler.common.Constants;
-import org.apache.dolphinscheduler.common.enums.AuthorizationType;
import org.apache.dolphinscheduler.common.enums.ComplementDependentMode;
import org.apache.dolphinscheduler.common.enums.FailureStrategy;
import org.apache.dolphinscheduler.common.enums.Priority;
@@ -57,7 +43,6 @@ import org.apache.dolphinscheduler.common.enums.TaskDependType;
import org.apache.dolphinscheduler.common.enums.UserType;
import org.apache.dolphinscheduler.common.enums.WarningType;
import org.apache.dolphinscheduler.common.utils.CodeGenerateUtils;
-import org.apache.dolphinscheduler.common.utils.PropertyUtils;
import org.apache.dolphinscheduler.dao.entity.DataSource;
import org.apache.dolphinscheduler.dao.entity.ProcessDefinition;
import org.apache.dolphinscheduler.dao.entity.Project;
@@ -75,14 +60,30 @@ import org.apache.dolphinscheduler.dao.mapper.ProjectUserMapper;
import org.apache.dolphinscheduler.dao.mapper.ScheduleMapper;
import org.apache.dolphinscheduler.dao.mapper.TaskDefinitionMapper;
import org.apache.dolphinscheduler.spi.enums.ResourceType;
+
+import py4j.GatewayServer;
+
+import org.apache.commons.collections.CollectionUtils;
+
+import java.io.IOException;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.stream.Collectors;
+
+import javax.annotation.PostConstruct;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Component;
-import py4j.GatewayServer;
@Component
public class PythonGateway {
+
private static final Logger logger = LoggerFactory.getLogger(PythonGateway.class);
private static final FailureStrategy DEFAULT_FAILURE_STRATEGY = FailureStrategy.CONTINUE;
@@ -147,6 +148,7 @@ public class PythonGateway {
// TODO replace this user to build in admin user if we make sure build in one could not be change
private final User dummyAdminUser = new User() {
+
{
setId(ADMIN_USER_ID);
setUserName("dummyUser");
@@ -155,6 +157,7 @@ public class PythonGateway {
};
private final Queue queuePythonGateway = new Queue() {
+
{
setId(Integer.MAX_VALUE);
setQueueName("queuePythonGateway");
@@ -171,7 +174,8 @@ public class PythonGateway {
return taskDefinitionService.genTaskCodeList(genNum);
}
- public Map<String, Long> getCodeAndVersion(String projectName, String processDefinitionName, String taskName) throws CodeGenerateUtils.CodeGenerateException {
+ public Map<String, Long> getCodeAndVersion(String projectName, String processDefinitionName,
+ String taskName) throws CodeGenerateUtils.CodeGenerateException {
Project project = projectMapper.queryByName(projectName);
Map<String, Long> result = new HashMap<>();
// project do not exists, mean task not exists too, so we should directly return init value
@@ -181,15 +185,18 @@ public class PythonGateway {
return result;
}
- ProcessDefinition processDefinition = processDefinitionMapper.queryByDefineName(project.getCode(), processDefinitionName);
- // In the case project exists, but current process definition still not created, we should also return the init version of it
+ ProcessDefinition processDefinition =
+ processDefinitionMapper.queryByDefineName(project.getCode(), processDefinitionName);
+ // In the case project exists, but current process definition still not created, we should also return the init
+ // version of it
if (processDefinition == null) {
result.put("code", CodeGenerateUtils.getInstance().genCode());
result.put("version", 0L);
return result;
}
- TaskDefinition taskDefinition = taskDefinitionMapper.queryByName(project.getCode(), processDefinition.getCode(), taskName);
+ TaskDefinition taskDefinition =
+ taskDefinitionMapper.queryByName(project.getCode(), processDefinition.getCode(), taskName);
if (taskDefinition == null) {
result.put("code", CodeGenerateUtils.getInstance().genCode());
result.put("version", 0L);
@@ -249,21 +256,26 @@ public class PythonGateway {
if (processDefinition != null) {
processDefinitionCode = processDefinition.getCode();
// make sure process definition offline which could edit
- processDefinitionService.releaseProcessDefinition(user, projectCode, processDefinitionCode, ReleaseState.OFFLINE);
- Map<String, Object> result = processDefinitionService.updateProcessDefinition(user, projectCode, name, processDefinitionCode, description, globalParams,
+ processDefinitionService.releaseProcessDefinition(user, projectCode, processDefinitionCode,
+ ReleaseState.OFFLINE);
+ Map<String, Object> result = processDefinitionService.updateProcessDefinition(user, projectCode, name,
+ processDefinitionCode, description, globalParams,
null, timeout, tenantCode, taskRelationJson, taskDefinitionJson, otherParamsJson, executionType);
} else {
- Map<String, Object> result = processDefinitionService.createProcessDefinition(user, projectCode, name, description, globalParams,
- null, timeout, tenantCode, taskRelationJson, taskDefinitionJson, otherParamsJson, executionType);
+ Map<String, Object> result = processDefinitionService.createProcessDefinition(user, projectCode, name,
+ description, globalParams,
+ null, timeout, tenantCode, taskRelationJson, taskDefinitionJson, otherParamsJson, executionType);
processDefinition = (ProcessDefinition) result.get(Constants.DATA_LIST);
processDefinitionCode = processDefinition.getCode();
}
// Fresh process definition schedule
if (schedule != null) {
- createOrUpdateSchedule(user, projectCode, processDefinitionCode, schedule, workerGroup, warningType, warningGroupId);
+ createOrUpdateSchedule(user, projectCode, processDefinitionCode, schedule, workerGroup, warningType,
+ warningGroupId);
}
- processDefinitionService.releaseProcessDefinition(user, projectCode, processDefinitionCode, ReleaseState.getEnum(releaseState));
+ processDefinitionService.releaseProcessDefinition(user, projectCode, processDefinitionCode,
+ ReleaseState.getEnum(releaseState));
return processDefinitionCode;
}
@@ -275,14 +287,16 @@ public class PythonGateway {
* @param processDefinitionName process definition name
*/
private ProcessDefinition getProcessDefinition(User user, long projectCode, String processDefinitionName) {
- Map<String, Object> verifyProcessDefinitionExists = processDefinitionService.verifyProcessDefinitionName(user, projectCode, processDefinitionName, 0);
+ Map<String, Object> verifyProcessDefinitionExists =
+ processDefinitionService.verifyProcessDefinitionName(user, projectCode, processDefinitionName, 0);
Status verifyStatus = (Status) verifyProcessDefinitionExists.get(Constants.STATUS);
ProcessDefinition processDefinition = null;
if (verifyStatus == Status.PROCESS_DEFINITION_NAME_EXIST) {
processDefinition = processDefinitionMapper.queryByDefineName(projectCode, processDefinitionName);
} else if (verifyStatus != Status.SUCCESS) {
- String msg = "Verify process definition exists status is invalid, neither SUCCESS or PROCESS_DEFINITION_NAME_EXIST.";
+ String msg =
+ "Verify process definition exists status is invalid, neither SUCCESS or PROCESS_DEFINITION_NAME_EXIST.";
logger.error(msg);
throw new RuntimeException(msg);
}
@@ -314,13 +328,16 @@ public class PythonGateway {
// create or update schedule
int scheduleId;
if (scheduleObj == null) {
- processDefinitionService.releaseProcessDefinition(user, projectCode, processDefinitionCode, ReleaseState.ONLINE);
- Map<String, Object> result = schedulerService.insertSchedule(user, projectCode, processDefinitionCode, schedule, WarningType.valueOf(warningType),
+ processDefinitionService.releaseProcessDefinition(user, projectCode, processDefinitionCode,
+ ReleaseState.ONLINE);
+ Map<String, Object> result = schedulerService.insertSchedule(user, projectCode, processDefinitionCode,
+ schedule, WarningType.valueOf(warningType),
warningGroupId, DEFAULT_FAILURE_STRATEGY, DEFAULT_PRIORITY, workerGroup, DEFAULT_ENVIRONMENT_CODE);
scheduleId = (int) result.get("scheduleId");
} else {
scheduleId = scheduleObj.getId();
- processDefinitionService.releaseProcessDefinition(user, projectCode, processDefinitionCode, ReleaseState.OFFLINE);
+ processDefinitionService.releaseProcessDefinition(user, projectCode, processDefinitionCode,
+ ReleaseState.OFFLINE);
schedulerService.updateSchedule(user, projectCode, scheduleId, schedule, WarningType.valueOf(warningType),
warningGroupId, DEFAULT_FAILURE_STRATEGY, DEFAULT_PRIORITY, workerGroup, DEFAULT_ENVIRONMENT_CODE);
}
@@ -334,14 +351,15 @@ public class PythonGateway {
String workerGroup,
String warningType,
Integer warningGroupId,
- Integer timeout
- ) {
+ Integer timeout) {
User user = usersService.queryUser(userName);
Project project = projectMapper.queryByName(projectName);
- ProcessDefinition processDefinition = processDefinitionMapper.queryByDefineName(project.getCode(), processDefinitionName);
+ ProcessDefinition processDefinition =
+ processDefinitionMapper.queryByDefineName(project.getCode(), processDefinitionName);
// make sure process definition online
- processDefinitionService.releaseProcessDefinition(user, project.getCode(), processDefinition.getCode(), ReleaseState.ONLINE);
+ processDefinitionService.releaseProcessDefinition(user, project.getCode(), processDefinition.getCode(),
+ ReleaseState.ONLINE);
executorService.execProcessInstance(user,
project.getCode(),
@@ -362,14 +380,13 @@ public class PythonGateway {
null,
DEFAULT_DRY_RUN,
DEFAULT_TEST_FLAG,
- COMPLEMENT_DEPENDENT_MODE
- );
+ COMPLEMENT_DEPENDENT_MODE);
}
// side object
/*
- Grant project's permission to user. Use when project's created user not current but
- Python API use it to change process definition.
+ * Grant project's permission to user. Use when project's created user not current but Python API use it to change
+ * process definition.
*/
private Integer grantProjectToUser(Project project, User user) {
Date now = new Date();
@@ -383,8 +400,8 @@ public class PythonGateway {
}
/*
- Grant or create project. Create a new project if project do not exists, and grant the project
- permission to user if project exists but without permission to this user.
+ * Grant or create project. Create a new project if project do not exists, and grant the project permission to user
+ * if project exists but without permission to this user.
*/
public void createOrGrantProject(String userName, String name, String desc) {
User user = usersService.queryUser(userName);
@@ -452,7 +469,8 @@ public class PythonGateway {
return user;
}
- public User updateUser(String userName, String userPassword, String email, String phone, String tenantCode, String queue, int state) throws Exception {
+ public User updateUser(String userName, String userPassword, String email, String phone, String tenantCode,
+ String queue, int state) throws Exception {
return usersService.createUserIfNotExists(userName, userPassword, email, phone, tenantCode, queue, state);
}
@@ -496,7 +514,8 @@ public class PythonGateway {
* @param projectName project name which process definition belongs to
* @param processDefinitionName process definition name
*/
- public Map<String, Object> getProcessDefinitionInfo(String userName, String projectName, String processDefinitionName) {
+ public Map<String, Object> getProcessDefinitionInfo(String userName, String projectName,
+ String processDefinitionName) {
Map<String, Object> result = new HashMap<>();
User user = usersService.queryUser(userName);
@@ -506,7 +525,8 @@ public class PythonGateway {
// get process definition info
if (processDefinition != null) {
// make sure process definition online
- processDefinitionService.releaseProcessDefinition(user, projectCode, processDefinition.getCode(), ReleaseState.ONLINE);
+ processDefinitionService.releaseProcessDefinition(user, projectCode, processDefinition.getCode(),
+ ReleaseState.ONLINE);
result.put("id", processDefinition.getId());
result.put("name", processDefinition.getName());
result.put("code", processDefinition.getCode());
@@ -539,7 +559,8 @@ public class PythonGateway {
long projectCode = project.getCode();
result.put("projectCode", projectCode);
- ProcessDefinition processDefinition = processDefinitionMapper.queryByDefineName(projectCode, processDefinitionName);
+ ProcessDefinition processDefinition =
+ processDefinitionMapper.queryByDefineName(projectCode, processDefinitionName);
if (processDefinition == null) {
String msg = String.format("Can not find valid process definition by name %s", processDefinitionName);
logger.error(msg);
@@ -548,7 +569,8 @@ public class PythonGateway {
result.put("processDefinitionCode", processDefinition.getCode());
if (taskName != null) {
- TaskDefinition taskDefinition = taskDefinitionMapper.queryByName(projectCode, processDefinition.getCode(), taskName);
+ TaskDefinition taskDefinition =
+ taskDefinitionMapper.queryByName(projectCode, processDefinition.getCode(), taskName);
result.put("taskDefinitionCode", taskDefinition.getCode());
}
return result;
@@ -564,11 +586,14 @@ public class PythonGateway {
public Map<String, Object> getResourcesFileInfo(String programType, String fullName) {
Map<String, Object> result = new HashMap<>();
- Result<Object> resources = resourceService.queryResourceByProgramType(dummyAdminUser, ResourceType.FILE, ProgramType.valueOf(programType));
+ Result<Object> resources = resourceService.queryResourceByProgramType(dummyAdminUser, ResourceType.FILE,
+ ProgramType.valueOf(programType));
List<ResourceComponent> resourcesComponent = (List<ResourceComponent>) resources.getData();
- List<ResourceComponent> namedResources = resourcesComponent.stream().filter(s -> fullName.equals(s.getFullName())).collect(Collectors.toList());
+ List<ResourceComponent> namedResources =
+ resourcesComponent.stream().filter(s -> fullName.equals(s.getFullName())).collect(Collectors.toList());
if (CollectionUtils.isEmpty(namedResources)) {
- String msg = String.format("Can not find valid resource by program type %s and name %s", programType, fullName);
+ String msg =
+ String.format("Can not find valid resource by program type %s and name %s", programType, fullName);
logger.error(msg);
throw new IllegalArgumentException(msg);
}
@@ -596,7 +621,6 @@ public class PythonGateway {
return environmentDto.getCode();
}
-
/**
* Get resource by given resource type and full name. It return map contain resource id, name.
* Useful in Python API create task which need processDefinition information.
@@ -623,7 +647,8 @@ public class PythonGateway {
* @return id of resource
*/
public Integer createOrUpdateResource(
- String userName, String fullName, String description, String resourceContent) {
+ String userName, String fullName, String description,
+ String resourceContent) {
return resourceService.createOrUpdateResource(userName, fullName, description, resourceContent);
}
@@ -640,15 +665,14 @@ public class PythonGateway {
InetAddress gatewayHost = InetAddress.getByName(pythonGatewayConfiguration.getGatewayServerAddress());
InetAddress pythonHost = InetAddress.getByName(pythonGatewayConfiguration.getPythonAddress());
server = new GatewayServer(
- this,
- pythonGatewayConfiguration.getGatewayServerPort(),
- pythonGatewayConfiguration.getPythonPort(),
- gatewayHost,
- pythonHost,
- pythonGatewayConfiguration.getConnectTimeout(),
- pythonGatewayConfiguration.getReadTimeout(),
- null
- );
+ this,
+ pythonGatewayConfiguration.getGatewayServerPort(),
+ pythonGatewayConfiguration.getPythonPort(),
+ gatewayHost,
+ pythonHost,
+ pythonGatewayConfiguration.getConnectTimeout(),
+ pythonGatewayConfiguration.getReadTimeout(),
+ null);
GatewayServer.turnLoggingOn();
logger.info("PythonGatewayService started on: " + gatewayHost.toString());
server.start();
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/security/Authenticator.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/security/Authenticator.java
index 99769b840b..5c2a556bb7 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/security/Authenticator.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/security/Authenticator.java
@@ -25,6 +25,7 @@ import java.util.Map;
import javax.servlet.http.HttpServletRequest;
public interface Authenticator {
+
/**
* Verifying legality via username and password
* @param username user name
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/security/SecurityConfig.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/security/SecurityConfig.java
index 6a17068e22..3e3bb1ae79 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/security/SecurityConfig.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/security/SecurityConfig.java
@@ -32,6 +32,7 @@ import org.springframework.context.annotation.Configuration;
@Configuration
public class SecurityConfig {
+
private static final Logger logger = LoggerFactory.getLogger(SecurityConfig.class);
@Value("${security.authentication.type:PASSWORD}")
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/security/impl/AbstractAuthenticator.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/security/impl/AbstractAuthenticator.java
index 8512aaf248..24587948c1 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/security/impl/AbstractAuthenticator.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/security/impl/AbstractAuthenticator.java
@@ -38,6 +38,7 @@ import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
public abstract class AbstractAuthenticator implements Authenticator {
+
private static final Logger logger = LoggerFactory.getLogger(AbstractAuthenticator.class);
@Autowired
@@ -106,7 +107,7 @@ public abstract class AbstractAuthenticator implements Authenticator {
logger.info("session info is null ");
return null;
}
- //get user object from session
+ // get user object from session
return userService.queryUser(session.getUserId());
}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/security/impl/ldap/LdapAuthenticator.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/security/impl/ldap/LdapAuthenticator.java
index 394ed44065..e849f884a5 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/security/impl/ldap/LdapAuthenticator.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/security/impl/ldap/LdapAuthenticator.java
@@ -32,7 +32,7 @@ public class LdapAuthenticator extends AbstractAuthenticator {
User user = null;
String ldapEmail = ldapService.ldapLogin(userId, password);
if (ldapEmail != null) {
- //check if user exist
+ // check if user exist
user = userService.getUserByUserName(userId);
if (user == null && ldapService.createIfUserNotExists()) {
user = userService.createUser(ldapService.getUserType(userId), userId, ldapEmail);
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/AccessTokenService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/AccessTokenService.java
index 1668cffe37..2dbfc4dce5 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/AccessTokenService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/AccessTokenService.java
@@ -57,7 +57,6 @@ public interface AccessTokenService {
*/
Result createToken(User loginUser, int userId, String expireTime, String token);
-
/**
* generate token
*
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/AlertGroupService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/AlertGroupService.java
index 8d7e49af51..538518b5ff 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/AlertGroupService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/AlertGroupService.java
@@ -76,7 +76,8 @@ public interface AlertGroupService {
* @param alertInstanceIds alertInstanceIds
* @return update result code
*/
- Map<String, Object> updateAlertgroup(User loginUser, int id, String groupName, String desc, String alertInstanceIds);
+ Map<String, Object> updateAlertgroup(User loginUser, int id, String groupName, String desc,
+ String alertInstanceIds);
/**
* delete alert group by id
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/AlertPluginInstanceService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/AlertPluginInstanceService.java
index 5296f31e11..24c7ce5100 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/AlertPluginInstanceService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/AlertPluginInstanceService.java
@@ -36,7 +36,7 @@ public interface AlertPluginInstanceService {
* @param pluginInstanceParams plugin instance params
* @return result
*/
- Map<String, Object> create(User loginUser,int pluginDefineId,String instanceName,String pluginInstanceParams);
+ Map<String, Object> create(User loginUser, int pluginDefineId, String instanceName, String pluginInstanceParams);
/**
* update
@@ -46,7 +46,8 @@ public interface AlertPluginInstanceService {
* @param pluginInstanceParams plugin instance params
* @return result
*/
- Map<String, Object> update(User loginUser, int alertPluginInstanceId,String instanceName,String pluginInstanceParams);
+ Map<String, Object> update(User loginUser, int alertPluginInstanceId, String instanceName,
+ String pluginInstanceParams);
/**
* delete alert plugin instance
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/BaseService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/BaseService.java
index a1fa21a9f1..6c86aeb0b2 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/BaseService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/BaseService.java
@@ -17,13 +17,14 @@
package org.apache.dolphinscheduler.api.service;
-import java.util.List;
-import java.util.Map;
-
import org.apache.dolphinscheduler.api.enums.Status;
import org.apache.dolphinscheduler.api.utils.Result;
import org.apache.dolphinscheduler.common.enums.AuthorizationType;
import org.apache.dolphinscheduler.dao.entity.User;
+
+import java.util.List;
+import java.util.Map;
+
import org.slf4j.Logger;
/**
@@ -39,7 +40,6 @@ public interface BaseService {
*/
boolean isAdmin(User user);
-
/**
* isNotAdmin
*
@@ -86,7 +86,6 @@ public interface BaseService {
*/
boolean check(Map<String, Object> result, boolean bool, Status userNoOperationPerm);
-
/**
* Verify that the operator has permissions
*
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ClusterService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ClusterService.java
index 0787e5db41..0b542579db 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ClusterService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ClusterService.java
@@ -96,4 +96,3 @@ public interface ClusterService {
Map<String, Object> verifyCluster(String clusterName);
}
-
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/DataAnalysisService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/DataAnalysisService.java
index cb4639acfc..389731682e 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/DataAnalysisService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/DataAnalysisService.java
@@ -19,6 +19,7 @@ package org.apache.dolphinscheduler.api.service;
import org.apache.dolphinscheduler.dao.entity.ExecuteStatusCount;
import org.apache.dolphinscheduler.dao.entity.User;
+
import org.apache.ibatis.annotations.Param;
import java.util.Date;
@@ -50,7 +51,8 @@ public interface DataAnalysisService {
* @param endDate end date
* @return process instance state count data
*/
- Map<String, Object> countProcessInstanceStateByProject(User loginUser, long projectCode, String startDate, String endDate);
+ Map<String, Object> countProcessInstanceStateByProject(User loginUser, long projectCode, String startDate,
+ String endDate);
/**
* statistics the process definition quantities of a certain person
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/DataSourceService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/DataSourceService.java
index eaf1552caa..c1454f948b 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/DataSourceService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/DataSourceService.java
@@ -142,5 +142,5 @@ public interface DataSourceService {
* @param tableName
* @return
*/
- Map<String, Object> getTableColumns(Integer datasourceId,String tableName);
+ Map<String, Object> getTableColumns(Integer datasourceId, String tableName);
}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/DqRuleService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/DqRuleService.java
index d0350556ac..df6d68d71e 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/DqRuleService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/DqRuleService.java
@@ -38,5 +38,5 @@ public interface DqRuleService {
String endTime,
Integer pageNo, Integer pageSize);
- Map<String,Object> getDatasourceOptionsById(int datasourceId);
+ Map<String, Object> getDatasourceOptionsById(int datasourceId);
}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/EnvironmentService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/EnvironmentService.java
index 617d2b26ac..ebedea43fe 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/EnvironmentService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/EnvironmentService.java
@@ -52,7 +52,6 @@ public interface EnvironmentService {
*/
Map<String, Object> queryEnvironmentByCode(Long code);
-
/**
* delete environment
*
@@ -71,7 +70,8 @@ public interface EnvironmentService {
* @param desc environment desc
* @param workerGroups worker groups
*/
- Map<String, Object> updateEnvironmentByCode(User loginUser, Long code, String name, String config, String desc, String workerGroups);
+ Map<String, Object> updateEnvironmentByCode(User loginUser, Long code, String name, String config, String desc,
+ String workerGroups);
/**
* query environment paging
@@ -100,4 +100,3 @@ public interface EnvironmentService {
Map<String, Object> verifyEnvironment(String environmentName);
}
-
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/EnvironmentWorkerGroupRelationService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/EnvironmentWorkerGroupRelationService.java
index 9db770158d..4d22814e5f 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/EnvironmentWorkerGroupRelationService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/EnvironmentWorkerGroupRelationService.java
@@ -38,4 +38,3 @@ public interface EnvironmentWorkerGroupRelationService {
*/
Map<String, Object> queryAllEnvironmentWorkerGroupRelationList();
}
-
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
index 9aaabb36b6..6f19a29caf 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
@@ -61,7 +61,8 @@ public interface ExecutorService {
Map<String, Object> execProcessInstance(User loginUser, long projectCode,
long processDefinitionCode, String cronTime, CommandType commandType,
FailureStrategy failureStrategy, String startNodeList,
- TaskDependType taskDependType, WarningType warningType, Integer warningGroupId,
+ TaskDependType taskDependType, WarningType warningType,
+ Integer warningGroupId,
RunMode runMode,
Priority processInstancePriority, String workerGroup, Long environmentCode,
Integer timeout,
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/K8sNamespaceService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/K8sNamespaceService.java
index d3f15a4dd6..7a14169acc 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/K8sNamespaceService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/K8sNamespaceService.java
@@ -50,7 +50,8 @@ public interface K8sNamespaceService {
* @param limitsMemory limits memory, can null means not limit
* @return
*/
- Map<String, Object> createK8sNamespace(User loginUser, String namespace, Long clusterCode, Double limitsCpu, Integer limitsMemory);
+ Map<String, Object> createK8sNamespace(User loginUser, String namespace, Long clusterCode, Double limitsCpu,
+ Integer limitsMemory);
/**
* update K8s Namespace tag and resource limit
@@ -61,7 +62,8 @@ public interface K8sNamespaceService {
* @param limitsMemory max memory
* @return
*/
- Map<String, Object> updateK8sNamespace(User loginUser, int id, String userName, Double limitsCpu, Integer limitsMemory);
+ Map<String, Object> updateK8sNamespace(User loginUser, int id, String userName, Double limitsCpu,
+ Integer limitsMemory);
/**
* verify namespace and k8s
@@ -106,4 +108,4 @@ public interface K8sNamespaceService {
* @return namespace list
*/
List<K8sNamespace> queryNamespaceAvailable(User loginUser);
-}
\ No newline at end of file
+}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/LoggerService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/LoggerService.java
index f7ba946e4c..33477c509e 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/LoggerService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/LoggerService.java
@@ -38,7 +38,6 @@ public interface LoggerService {
*/
Result<ResponseTaskLog> queryLog(int taskInstId, int skipLineNum, int limit);
-
/**
* get log size
*
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/MonitorService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/MonitorService.java
index d301957955..e881b2e346 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/MonitorService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/MonitorService.java
@@ -34,23 +34,23 @@ public interface MonitorService {
* @param loginUser login user
* @return data base state
*/
- Map<String,Object> queryDatabaseState(User loginUser);
-
+ Map<String, Object> queryDatabaseState(User loginUser);
+
/**
* query master list
*
* @param loginUser login user
* @return master information list
*/
- Map<String,Object> queryMaster(User loginUser);
-
+ Map<String, Object> queryMaster(User loginUser);
+
/**
* query worker list
*
* @param loginUser login user
* @return worker information list
*/
- Map<String,Object> queryWorker(User loginUser);
-
+ Map<String, Object> queryWorker(User loginUser);
+
List<Server> getServerListFromRegistry(boolean isMaster);
}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionService.java
index e887d0f017..8019cc40ae 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionService.java
@@ -245,8 +245,8 @@ public interface ProcessDefinitionService {
* @return delete result code
*/
Map<String, Object> batchDeleteProcessDefinitionByCodes(User loginUser,
- long projectCode,
- String codes);
+ long projectCode,
+ String codes);
/**
* delete process definition by code
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java
index ca03353740..d84ca5d3cb 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java
@@ -18,16 +18,16 @@
package org.apache.dolphinscheduler.api.service;
-import java.io.IOException;
-import java.util.List;
-import java.util.Map;
-
import org.apache.dolphinscheduler.api.utils.Result;
import org.apache.dolphinscheduler.common.enums.WorkflowExecutionStatus;
import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
import org.apache.dolphinscheduler.dao.entity.User;
import org.apache.dolphinscheduler.plugin.task.api.enums.DependResult;
+import java.io.IOException;
+import java.util.List;
+import java.util.Map;
+
/**
* process instance service
*/
@@ -201,4 +201,4 @@ public interface ProcessInstanceService {
*/
List<ProcessInstance> queryByProcessDefineCode(Long processDefinitionCode,
int size);
-}
\ No newline at end of file
+}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/QueueService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/QueueService.java
index 553cde34b5..0f62ea9028 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/QueueService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/QueueService.java
@@ -21,8 +21,6 @@ import org.apache.dolphinscheduler.api.utils.Result;
import org.apache.dolphinscheduler.dao.entity.Queue;
import org.apache.dolphinscheduler.dao.entity.User;
-import java.util.Map;
-
/**
* queue service
*/
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ResourcesService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ResourcesService.java
index 00c6fa151b..4de830c074 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ResourcesService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ResourcesService.java
@@ -98,7 +98,8 @@ public interface ResourcesService {
* @param pageSize page size
* @return resource list page
*/
- Result queryResourceListPaging(User loginUser, int directoryId, ResourceType type, String searchVal, Integer pageNo, Integer pageSize);
+ Result queryResourceListPaging(User loginUser, int directoryId, ResourceType type, String searchVal, Integer pageNo,
+ Integer pageSize);
/**
* query resource list
@@ -135,7 +136,7 @@ public interface ResourcesService {
* @param type resource type
* @return true if the resource name not exists, otherwise return false
*/
- Result<Object> verifyResourceName(String fullName, ResourceType type,User loginUser);
+ Result<Object> verifyResourceName(String fullName, ResourceType type, User loginUser);
/**
* verify resource by full name or pid and type
@@ -144,7 +145,7 @@ public interface ResourcesService {
* @param type resource type
* @return true if the resource full name or pid not exists, otherwise return false
*/
- Result<Object> queryResource(User loginUser,String fullName,Integer id,ResourceType type);
+ Result<Object> queryResource(User loginUser, String fullName, Integer id, ResourceType type);
/**
* view resource file online
@@ -154,7 +155,7 @@ public interface ResourcesService {
* @param limit limit
* @return resource content
*/
- Result<Object> readResource(User loginUser,int resourceId, int skipLineNum, int limit);
+ Result<Object> readResource(User loginUser, int resourceId, int skipLineNum, int limit);
/**
* create resource file online
@@ -167,7 +168,8 @@ public interface ResourcesService {
* @param content content
* @return create result code
*/
- Result<Object> onlineCreateResource(User loginUser, ResourceType type, String fileName, String fileSuffix, String desc, String content,int pid,String currentDirectory);
+ Result<Object> onlineCreateResource(User loginUser, ResourceType type, String fileName, String fileSuffix,
+ String desc, String content, int pid, String currentDirectory);
/**
* create or update resource.
@@ -179,7 +181,8 @@ public interface ResourcesService {
* @param content content of resource
* @return create result code
*/
- Result<Object> onlineCreateOrUpdateResourceWithDir(User loginUser, String fileFullName, String desc, String content);
+ Result<Object> onlineCreateOrUpdateResourceWithDir(User loginUser, String fileFullName, String desc,
+ String content);
/**
* create or update resource.
@@ -200,7 +203,7 @@ public interface ResourcesService {
* @param content content
* @return update result cod
*/
- Result<Object> updateResourceContent(User loginUser,int resourceId, String content);
+ Result<Object> updateResourceContent(User loginUser, int resourceId, String content);
/**
* download file
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskGroupQueueService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskGroupQueueService.java
index e6e81d950b..a0d05c5b8d 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskGroupQueueService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskGroupQueueService.java
@@ -35,11 +35,11 @@ public interface TaskGroupQueueService {
* @param status Task queue status
* @param pageNo page no
* @param pageSize page size
-
+
* @return tasks list
*/
- Map<String, Object> queryTasksByGroupId(User loginUser, String taskName
- , String processName, Integer status, int groupId, int pageNo,int pageSize);
+ Map<String, Object> queryTasksByGroupId(User loginUser, String taskName, String processName, Integer status,
+ int groupId, int pageNo, int pageSize);
/**
* query tasks in task group queue by project id
@@ -68,7 +68,7 @@ public interface TaskGroupQueueService {
*/
boolean deleteByTaskId(int taskId);
- void forceStartTask(int queueId,int forceStart);
+ void forceStartTask(int queueId, int forceStart);
void modifyPriority(Integer queueId, Integer priority);
}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskGroupService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskGroupService.java
index 4b15ca878f..3987109733 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskGroupService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskGroupService.java
@@ -66,7 +66,7 @@ public interface TaskGroupService {
* @param pageSize page size
* @return the result code and msg
*/
- Map<String, Object> queryAllTaskGroup(User loginUser, String name,Integer status, int pageNo, int pageSize);
+ Map<String, Object> queryAllTaskGroup(User loginUser, String name, Integer status, int pageNo, int pageSize);
/**
* query all task group by status
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TenantService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TenantService.java
index 0d795a10c4..fc5abf4b6b 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TenantService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TenantService.java
@@ -66,7 +66,7 @@ public interface TenantService {
* @throws Exception exception
*/
Map<String, Object> updateTenant(User loginUser, int id, String tenantCode, int queueId,
- String desc) throws Exception;
+ String desc) throws Exception;
/**
* delete tenant
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UdfFuncService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UdfFuncService.java
index 1f5d1ab339..0cac41663f 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UdfFuncService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UdfFuncService.java
@@ -21,8 +21,6 @@ import org.apache.dolphinscheduler.api.utils.Result;
import org.apache.dolphinscheduler.common.enums.UdfType;
import org.apache.dolphinscheduler.dao.entity.User;
-import java.util.Map;
-
/**
* udf func service
*/
@@ -56,7 +54,7 @@ public interface UdfFuncService {
* @param id udf function id
* @return udf function detail
*/
- Result<Object> queryUdfFuncDetail(User loginUser,int id);
+ Result<Object> queryUdfFuncDetail(User loginUser, int id);
/**
* updateProcessInstance udf function
@@ -72,14 +70,14 @@ public interface UdfFuncService {
* @return update result code
*/
Result<Object> updateUdfFunc(User loginUser,
- int udfFuncId,
- String funcName,
- String className,
- String argTypes,
- String database,
- String desc,
- UdfType type,
- int resourceId);
+ int udfFuncId,
+ String funcName,
+ String className,
+ String argTypes,
+ String database,
+ String desc,
+ UdfType type,
+ int resourceId);
/**
* query udf function list paging
@@ -117,4 +115,4 @@ public interface UdfFuncService {
*/
Result<Object> verifyUdfFuncByName(User loginUser, String name);
-}
\ No newline at end of file
+}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UsersService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UsersService.java
index b4555ad505..d854e9afdd 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UsersService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/UsersService.java
@@ -130,7 +130,8 @@ public interface UsersService {
* @throws Exception exception
*/
Map<String, Object> updateUser(User loginUser, int userId, String userName, String userPassword, String email,
- int tenantId, String phone, String queue, int state, String timeZone) throws IOException;
+ int tenantId, String phone, String queue, int state,
+ String timeZone) throws IOException;
/**
* delete user
@@ -152,7 +153,6 @@ public interface UsersService {
*/
Map<String, Object> grantProject(User loginUser, int userId, String projectIds);
-
/**
* grant project by code
*
@@ -182,7 +182,6 @@ public interface UsersService {
*/
Map<String, Object> grantResources(User loginUser, int userId, String resourceIds);
-
/**
* grant udf function
*
@@ -193,7 +192,6 @@ public interface UsersService {
*/
Map<String, Object> grantUDFFunction(User loginUser, int userId, String udfIds);
-
/**
* grant namespace
*
@@ -204,7 +202,6 @@ public interface UsersService {
*/
Map<String, Object> grantNamespaces(User loginUser, int userId, String namespaceIds);
-
/**
* grant datasource
*
@@ -231,7 +228,6 @@ public interface UsersService {
*/
Map<String, Object> queryAllGeneralUsers(User loginUser);
-
/**
* query user list
*
@@ -248,7 +244,6 @@ public interface UsersService {
*/
Result<Object> verifyUserName(String userName);
-
/**
* unauthorized user
*
@@ -258,7 +253,6 @@ public interface UsersService {
*/
Map<String, Object> unauthorizedUser(User loginUser, Integer alertGroupId);
-
/**
* authorized user
*
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/WorkerGroupService.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/WorkerGroupService.java
index 4c474b75cd..b2f9d78178 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/WorkerGroupService.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/WorkerGroupService.java
@@ -38,7 +38,8 @@ public interface WorkerGroupService {
* @param otherParamsJson otherParamsJson
* @return create or update result code
*/
- Map<String, Object> saveWorkerGroup(User loginUser, int id, String name, String addrList, String description, String otherParamsJson);
+ Map<String, Object> saveWorkerGroup(User loginUser, int id, String name, String addrList, String description,
+ String otherParamsJson);
/**
* query worker group paging
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AccessTokenServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AccessTokenServiceImpl.java
index 42b56a0909..17e0729f9c 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AccessTokenServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AccessTokenServiceImpl.java
@@ -125,7 +125,8 @@ public class AccessTokenServiceImpl extends BaseServiceImpl implements AccessTok
Result result = new Result();
// 1. check permission
- if (!(canOperatorPermissions(loginUser,null, AuthorizationType.ACCESS_TOKEN,ACCESS_TOKEN_CREATE) || loginUser.getId() == userId)) {
+ if (!(canOperatorPermissions(loginUser, null, AuthorizationType.ACCESS_TOKEN, ACCESS_TOKEN_CREATE)
+ || loginUser.getId() == userId)) {
putMsg(result, Status.USER_NO_OPERATION_PERM);
return result;
}
@@ -190,7 +191,7 @@ public class AccessTokenServiceImpl extends BaseServiceImpl implements AccessTok
@Override
public Map<String, Object> delAccessTokenById(User loginUser, int id) {
Map<String, Object> result = new HashMap<>();
- if (!canOperatorPermissions(loginUser, null, AuthorizationType.ACCESS_TOKEN,ACCESS_TOKEN_DELETE)) {
+ if (!canOperatorPermissions(loginUser, null, AuthorizationType.ACCESS_TOKEN, ACCESS_TOKEN_DELETE)) {
putMsg(result, Status.USER_NO_OPERATION_PERM);
return result;
}
@@ -226,7 +227,7 @@ public class AccessTokenServiceImpl extends BaseServiceImpl implements AccessTok
Map<String, Object> result = new HashMap<>();
// 1. check permission
- if (!canOperatorPermissions(loginUser, null,AuthorizationType.ACCESS_TOKEN,ACCESS_TOKEN_UPDATE)) {
+ if (!canOperatorPermissions(loginUser, null, AuthorizationType.ACCESS_TOKEN, ACCESS_TOKEN_UPDATE)) {
putMsg(result, Status.USER_NO_OPERATION_PERM);
return result;
}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertGroupServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertGroupServiceImpl.java
index 2b528acf46..145c9aee84 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertGroupServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertGroupServiceImpl.java
@@ -17,6 +17,11 @@
package org.apache.dolphinscheduler.api.service.impl;
+import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.ALERT_GROUP_CREATE;
+import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.ALERT_GROUP_DELETE;
+import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.ALERT_GROUP_UPDATE;
+import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.ALERT_GROUP_VIEW;
+
import org.apache.dolphinscheduler.api.enums.Status;
import org.apache.dolphinscheduler.api.service.AlertGroupService;
import org.apache.dolphinscheduler.api.utils.PageInfo;
@@ -48,8 +53,6 @@ import org.springframework.transaction.annotation.Transactional;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.*;
-
/**
* alert group service impl
*/
@@ -74,7 +77,8 @@ public class AlertGroupServiceImpl extends BaseServiceImpl implements AlertGroup
if (loginUser.getUserType().equals(UserType.ADMIN_USER)) {
alertGroups = alertGroupMapper.queryAllGroupList();
} else {
- Set<Integer> ids = resourcePermissionCheckService.userOwnedResourceIdsAcquisition(AuthorizationType.ALERT_GROUP, loginUser.getId(), logger);
+ Set<Integer> ids = resourcePermissionCheckService
+ .userOwnedResourceIdsAcquisition(AuthorizationType.ALERT_GROUP, loginUser.getId(), logger);
if (ids.isEmpty()) {
result.put(Constants.DATA_LIST, Collections.emptyList());
putMsg(result, Status.SUCCESS);
@@ -99,12 +103,12 @@ public class AlertGroupServiceImpl extends BaseServiceImpl implements AlertGroup
Map<String, Object> result = new HashMap<>();
result.put(Constants.STATUS, false);
- //only admin can operate
- if (!canOperatorPermissions(loginUser,new Object[]{id}, AuthorizationType.ALERT_GROUP,ALERT_GROUP_VIEW)) {
+ // only admin can operate
+ if (!canOperatorPermissions(loginUser, new Object[]{id}, AuthorizationType.ALERT_GROUP, ALERT_GROUP_VIEW)) {
putMsg(result, Status.USER_NO_OPERATION_PERM);
return result;
}
- //check if exist
+ // check if exist
AlertGroup alertGroup = alertGroupMapper.selectById(id);
if (alertGroup == null) {
putMsg(result, Status.ALERT_GROUP_NOT_EXIST);
@@ -134,7 +138,8 @@ public class AlertGroupServiceImpl extends BaseServiceImpl implements AlertGroup
if (loginUser.getUserType().equals(UserType.ADMIN_USER)) {
alertGroupPage = alertGroupMapper.queryAlertGroupPage(page, searchVal);
} else {
- Set<Integer> ids = resourcePermissionCheckService.userOwnedResourceIdsAcquisition(AuthorizationType.ALERT_GROUP, loginUser.getId(), logger);
+ Set<Integer> ids = resourcePermissionCheckService
+ .userOwnedResourceIdsAcquisition(AuthorizationType.ALERT_GROUP, loginUser.getId(), logger);
if (ids.isEmpty()) {
result.setData(pageInfo);
putMsg(result, Status.SUCCESS);
@@ -161,14 +166,15 @@ public class AlertGroupServiceImpl extends BaseServiceImpl implements AlertGroup
*/
@Override
@Transactional
- public Map<String, Object> createAlertgroup(User loginUser, String groupName, String desc, String alertInstanceIds) {
+ public Map<String, Object> createAlertgroup(User loginUser, String groupName, String desc,
+ String alertInstanceIds) {
Map<String, Object> result = new HashMap<>();
- //only admin can operate
- if (!canOperatorPermissions(loginUser,null, AuthorizationType.ALERT_GROUP, ALERT_GROUP_CREATE)) {
+ // only admin can operate
+ if (!canOperatorPermissions(loginUser, null, AuthorizationType.ALERT_GROUP, ALERT_GROUP_CREATE)) {
putMsg(result, Status.USER_NO_OPERATION_PERM);
return result;
}
- if(checkDescriptionLength(desc)){
+ if (checkDescriptionLength(desc)) {
logger.warn("Parameter description is too long.");
putMsg(result, Status.DESCRIPTION_TOO_LONG_ERROR);
return result;
@@ -189,7 +195,8 @@ public class AlertGroupServiceImpl extends BaseServiceImpl implements AlertGroup
if (insert > 0) {
result.put(Constants.DATA_LIST, alertGroup);
putMsg(result, Status.SUCCESS);
- permissionPostHandle(AuthorizationType.ALERT_GROUP, loginUser.getId(), Collections.singletonList(alertGroup.getId()), logger);
+ permissionPostHandle(AuthorizationType.ALERT_GROUP, loginUser.getId(),
+ Collections.singletonList(alertGroup.getId()), logger);
logger.info("Create alert group complete, groupName:{}", alertGroup.getGroupName());
} else {
logger.error("Create alert group error, groupName:{}", alertGroup.getGroupName());
@@ -214,14 +221,15 @@ public class AlertGroupServiceImpl extends BaseServiceImpl implements AlertGroup
* @return update result code
*/
@Override
- public Map<String, Object> updateAlertgroup(User loginUser, int id, String groupName, String desc, String alertInstanceIds) {
+ public Map<String, Object> updateAlertgroup(User loginUser, int id, String groupName, String desc,
+ String alertInstanceIds) {
Map<String, Object> result = new HashMap<>();
- if (!canOperatorPermissions(loginUser, new Object[]{id},AuthorizationType.ALERT_GROUP,ALERT_GROUP_UPDATE)) {
+ if (!canOperatorPermissions(loginUser, new Object[]{id}, AuthorizationType.ALERT_GROUP, ALERT_GROUP_UPDATE)) {
putMsg(result, Status.USER_NO_OPERATION_PERM);
return result;
}
- if(checkDescriptionLength(desc)){
+ if (checkDescriptionLength(desc)) {
logger.warn("Parameter description is too long.");
putMsg(result, Status.DESCRIPTION_TOO_LONG_ERROR);
return result;
@@ -268,8 +276,8 @@ public class AlertGroupServiceImpl extends BaseServiceImpl implements AlertGroup
Map<String, Object> result = new HashMap<>();
result.put(Constants.STATUS, false);
- //only admin can operate
- if (!canOperatorPermissions(loginUser,new Object[]{id}, AuthorizationType.ALERT_GROUP,ALERT_GROUP_DELETE)) {
+ // only admin can operate
+ if (!canOperatorPermissions(loginUser, new Object[]{id}, AuthorizationType.ALERT_GROUP, ALERT_GROUP_DELETE)) {
putMsg(result, Status.USER_NO_OPERATION_PERM);
return result;
}
@@ -281,7 +289,7 @@ public class AlertGroupServiceImpl extends BaseServiceImpl implements AlertGroup
return result;
}
- //check exist
+ // check exist
AlertGroup alertGroup = alertGroupMapper.selectById(id);
if (alertGroup == null) {
logger.error("Alert group does not exist, id:{}.", id);
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertPluginInstanceServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertPluginInstanceServiceImpl.java
index ee95249209..fa7b44362a 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertPluginInstanceServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertPluginInstanceServiceImpl.java
@@ -17,6 +17,10 @@
package org.apache.dolphinscheduler.api.service.impl;
+import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.ALART_INSTANCE_CREATE;
+import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.ALERT_PLUGIN_DELETE;
+import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.ALERT_PLUGIN_UPDATE;
+
import org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant;
import org.apache.dolphinscheduler.api.enums.Status;
import org.apache.dolphinscheduler.api.service.AlertPluginInstanceService;
@@ -55,8 +59,6 @@ import org.springframework.stereotype.Service;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.*;
-
/**
* alert plugin instance service impl
*/
@@ -84,7 +86,8 @@ public class AlertPluginInstanceServiceImpl extends BaseServiceImpl implements A
* @param pluginInstanceParams plugin instance params
*/
@Override
- public Map<String, Object> create(User loginUser, int pluginDefineId, String instanceName, String pluginInstanceParams) {
+ public Map<String, Object> create(User loginUser, int pluginDefineId, String instanceName,
+ String pluginInstanceParams) {
AlertPluginInstance alertPluginInstance = new AlertPluginInstance();
String paramsMapJson = parsePluginParamsMap(pluginInstanceParams);
alertPluginInstance.setPluginInstanceParams(paramsMapJson);
@@ -92,12 +95,13 @@ public class AlertPluginInstanceServiceImpl extends BaseServiceImpl implements A
alertPluginInstance.setPluginDefineId(pluginDefineId);
Map<String, Object> result = new HashMap<>();
- if (!canOperatorPermissions(loginUser,null, AuthorizationType.ALERT_PLUGIN_INSTANCE,ALART_INSTANCE_CREATE)) {
+ if (!canOperatorPermissions(loginUser, null, AuthorizationType.ALERT_PLUGIN_INSTANCE, ALART_INSTANCE_CREATE)) {
putMsg(result, Status.USER_NO_OPERATION_PERM);
return result;
}
if (alertPluginInstanceMapper.existInstanceName(alertPluginInstance.getInstanceName()) == Boolean.TRUE) {
- logger.error("Plugin instance with the same name already exists, name:{}.", alertPluginInstance.getInstanceName());
+ logger.error("Plugin instance with the same name already exists, name:{}.",
+ alertPluginInstance.getInstanceName());
putMsg(result, Status.PLUGIN_INSTANCE_ALREADY_EXIT);
return result;
}
@@ -123,14 +127,16 @@ public class AlertPluginInstanceServiceImpl extends BaseServiceImpl implements A
* @param pluginInstanceParams plugin instance params
*/
@Override
- public Map<String, Object> update(User loginUser, int pluginInstanceId, String instanceName, String pluginInstanceParams) {
+ public Map<String, Object> update(User loginUser, int pluginInstanceId, String instanceName,
+ String pluginInstanceParams) {
String paramsMapJson = parsePluginParamsMap(pluginInstanceParams);
- AlertPluginInstance alertPluginInstance = new AlertPluginInstance(pluginInstanceId, paramsMapJson, instanceName, new Date());
+ AlertPluginInstance alertPluginInstance =
+ new AlertPluginInstance(pluginInstanceId, paramsMapJson, instanceName, new Date());
Map<String, Object> result = new HashMap<>();
- if (!canOperatorPermissions(loginUser,null, AuthorizationType.ALERT_PLUGIN_INSTANCE,ALERT_PLUGIN_UPDATE)) {
+ if (!canOperatorPermissions(loginUser, null, AuthorizationType.ALERT_PLUGIN_INSTANCE, ALERT_PLUGIN_UPDATE)) {
putMsg(result, Status.USER_NO_OPERATION_PERM);
return result;
}
@@ -158,14 +164,14 @@ public class AlertPluginInstanceServiceImpl extends BaseServiceImpl implements A
@Override
public Map<String, Object> delete(User loginUser, int id) {
Map<String, Object> result = new HashMap<>();
- //check if there is an associated alert group
+ // check if there is an associated alert group
boolean hasAssociatedAlertGroup = checkHasAssociatedAlertGroup(String.valueOf(id));
if (hasAssociatedAlertGroup) {
logger.warn("Delete alert plugin failed because alert group is using it, pluginId:{}.", id);
putMsg(result, Status.DELETE_ALERT_PLUGIN_INSTANCE_ERROR_HAS_ALERT_GROUP_ASSOCIATED);
return result;
}
- if (!canOperatorPermissions(loginUser,null, AuthorizationType.ALERT_PLUGIN_INSTANCE,ALERT_PLUGIN_DELETE)) {
+ if (!canOperatorPermissions(loginUser, null, AuthorizationType.ALERT_PLUGIN_INSTANCE, ALERT_PLUGIN_DELETE)) {
putMsg(result, Status.USER_NO_OPERATION_PERM);
return result;
}
@@ -190,7 +196,8 @@ public class AlertPluginInstanceServiceImpl extends BaseServiceImpl implements A
public Map<String, Object> get(User loginUser, int id) {
Map<String, Object> result = new HashMap<>();
AlertPluginInstance alertPluginInstance = alertPluginInstanceMapper.selectById(id);
- if (!canOperatorPermissions(loginUser,null, AuthorizationType.ALERT_PLUGIN_INSTANCE,ApiFuncIdentificationConstant.ALARM_INSTANCE_MANAGE)) {
+ if (!canOperatorPermissions(loginUser, null, AuthorizationType.ALERT_PLUGIN_INSTANCE,
+ ApiFuncIdentificationConstant.ALARM_INSTANCE_MANAGE)) {
putMsg(result, Status.USER_NO_OPERATION_PERM);
return result;
}
@@ -225,7 +232,8 @@ public class AlertPluginInstanceServiceImpl extends BaseServiceImpl implements A
Result result = new Result();
Page<AlertPluginInstance> page = new Page<>(pageNo, pageSize);
- IPage<AlertPluginInstance> alertPluginInstanceIPage = alertPluginInstanceMapper.queryByInstanceNamePage(page, searchVal);
+ IPage<AlertPluginInstance> alertPluginInstanceIPage =
+ alertPluginInstanceMapper.queryByInstanceNamePage(page, searchVal);
PageInfo<AlertPluginInstanceVO> pageInfo = new PageInfo<>(pageNo, pageSize);
pageInfo.setTotal((int) alertPluginInstanceIPage.getTotal());
@@ -243,7 +251,8 @@ public class AlertPluginInstanceServiceImpl extends BaseServiceImpl implements A
if (CollectionUtils.isEmpty(pluginDefineList)) {
return null;
}
- Map<Integer, PluginDefine> pluginDefineMap = pluginDefineList.stream().collect(Collectors.toMap(PluginDefine::getId, Function.identity()));
+ Map<Integer, PluginDefine> pluginDefineMap =
+ pluginDefineList.stream().collect(Collectors.toMap(PluginDefine::getId, Function.identity()));
List<AlertPluginInstanceVO> alertPluginInstanceVOS = new ArrayList<>();
alertPluginInstances.forEach(alertPluginInstance -> {
AlertPluginInstanceVO alertPluginInstanceVO = new AlertPluginInstanceVO();
@@ -254,12 +263,13 @@ public class AlertPluginInstanceServiceImpl extends BaseServiceImpl implements A
alertPluginInstanceVO.setInstanceName(alertPluginInstance.getInstanceName());
alertPluginInstanceVO.setId(alertPluginInstance.getId());
PluginDefine pluginDefine = pluginDefineMap.get(alertPluginInstance.getPluginDefineId());
- //FIXME When the user removes the plug-in, this will happen. At this time, maybe we should add a new field to indicate that the plug-in has expired?
+ // FIXME When the user removes the plug-in, this will happen. At this time, maybe we should add a new field
+ // to indicate that the plug-in has expired?
if (null == pluginDefine) {
return;
}
alertPluginInstanceVO.setAlertPluginName(pluginDefine.getPluginName());
- //todo List pages do not recommend returning this parameter
+ // todo List pages do not recommend returning this parameter
String pluginParamsMapString = alertPluginInstance.getPluginInstanceParams();
String uiPluginParams = parseToPluginUiParams(pluginParamsMapString, pluginDefine.getPluginParams());
alertPluginInstanceVO.setPluginInstanceParams(uiPluginParams);
@@ -288,7 +298,8 @@ public class AlertPluginInstanceServiceImpl extends BaseServiceImpl implements A
* @return Complete parameters list(include ui)
*/
private String parseToPluginUiParams(String pluginParamsMapString, String pluginUiParams) {
- List<Map<String, Object>> pluginParamsList = PluginParamsTransfer.generatePluginParams(pluginParamsMapString, pluginUiParams);
+ List<Map<String, Object>> pluginParamsList =
+ PluginParamsTransfer.generatePluginParams(pluginParamsMapString, pluginUiParams);
return JSONUtils.toJsonString(pluginParamsList);
}
@@ -297,7 +308,8 @@ public class AlertPluginInstanceServiceImpl extends BaseServiceImpl implements A
if (CollectionUtils.isEmpty(idsList)) {
return false;
}
- Optional<String> first = idsList.stream().filter(k -> null != k && Arrays.asList(k.split(",")).contains(id)).findFirst();
+ Optional<String> first =
+ idsList.stream().filter(k -> null != k && Arrays.asList(k.split(",")).contains(id)).findFirst();
return first.isPresent();
}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AuditServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AuditServiceImpl.java
index 2ae6740838..bc798c9eea 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AuditServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AuditServiceImpl.java
@@ -88,7 +88,7 @@ public class AuditServiceImpl extends BaseServiceImpl implements AuditService {
Map<String, Object> checkAndParseDateResult = checkAndParseDateParameters(startDate, endDate);
Status resultEnum = (Status) checkAndParseDateResult.get(Constants.STATUS);
if (resultEnum != Status.SUCCESS) {
- putMsg(result,resultEnum);
+ putMsg(result, resultEnum);
return result;
}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/BaseServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/BaseServiceImpl.java
index d8d24925b2..ad0a9fe828 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/BaseServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/BaseServiceImpl.java
@@ -17,15 +17,6 @@
package org.apache.dolphinscheduler.api.service.impl;
-import java.io.IOException;
-import java.text.MessageFormat;
-import java.util.Date;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-import java.util.Objects;
-
-import org.apache.commons.lang3.StringUtils;
import org.apache.dolphinscheduler.api.enums.Status;
import org.apache.dolphinscheduler.api.permission.ResourcePermissionCheckService;
import org.apache.dolphinscheduler.api.service.BaseService;
@@ -35,6 +26,16 @@ import org.apache.dolphinscheduler.common.enums.AuthorizationType;
import org.apache.dolphinscheduler.common.enums.UserType;
import org.apache.dolphinscheduler.common.utils.DateUtils;
import org.apache.dolphinscheduler.dao.entity.User;
+
+import org.apache.commons.lang3.StringUtils;
+
+import java.text.MessageFormat;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import java.util.Objects;
+
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.beans.factory.annotation.Autowired;
@@ -43,16 +44,18 @@ import org.springframework.beans.factory.annotation.Autowired;
* base service impl
*/
public class BaseServiceImpl implements BaseService {
+
private static final Logger logger = LoggerFactory.getLogger(BaseServiceImpl.class);
@Autowired
protected ResourcePermissionCheckService resourcePermissionCheckService;
@Override
- public void permissionPostHandle(AuthorizationType authorizationType, Integer userId, List<Integer> ids, Logger logger) {
- try{
+ public void permissionPostHandle(AuthorizationType authorizationType, Integer userId, List<Integer> ids,
+ Logger logger) {
+ try {
resourcePermissionCheckService.postHandle(authorizationType, userId, ids, logger);
- }catch (Exception e){
+ } catch (Exception e) {
logger.error("Post handle error, userId:{}.", userId, e);
throw new RuntimeException("Resource association user error", e);
}
@@ -78,7 +81,7 @@ public class BaseServiceImpl implements BaseService {
*/
@Override
public boolean isNotAdmin(User loginUser, Map<String, Object> result) {
- //only admin can operate
+ // only admin can operate
if (!isAdmin(loginUser)) {
putMsg(result, Status.USER_NO_OPERATION_PERM);
return true;
@@ -145,14 +148,14 @@ public class BaseServiceImpl implements BaseService {
* @param tenantCode tenant code
* @throws IOException if hdfs operation exception
*/
-// @Override
-// public void createTenantDirIfNotExists(String tenantCode) throws IOException {
-// String resourcePath = HadoopUtils.getHdfsResDir(tenantCode);
-// String udfsPath = HadoopUtils.getHdfsUdfDir(tenantCode);
-// // init resource path and udf path
-// HadoopUtils.getInstance().mkdir(tenantCode,resourcePath);
-// HadoopUtils.getInstance().mkdir(tenantCode,udfsPath);
-// }
+ // @Override
+ // public void createTenantDirIfNotExists(String tenantCode) throws IOException {
+ // String resourcePath = HadoopUtils.getHdfsResDir(tenantCode);
+ // String udfsPath = HadoopUtils.getHdfsUdfDir(tenantCode);
+ // // init resource path and udf path
+ // HadoopUtils.getInstance().mkdir(tenantCode,resourcePath);
+ // HadoopUtils.getInstance().mkdir(tenantCode,udfsPath);
+ // }
/**
* Verify that the operator has permissions
@@ -173,9 +176,11 @@ public class BaseServiceImpl implements BaseService {
* @return boolean
*/
@Override
- public boolean canOperatorPermissions(User user, Object[] ids,AuthorizationType type,String permissionKey) {
- boolean operationPermissionCheck = resourcePermissionCheckService.operationPermissionCheck(type, type.equals(AuthorizationType.PROJECTS) ? ids : null, user.getId(), permissionKey, logger);
- boolean resourcePermissionCheck = resourcePermissionCheckService.resourcePermissionCheck(type, ids, user.getUserType().equals(UserType.ADMIN_USER) ? 0 : user.getId(), logger);
+ public boolean canOperatorPermissions(User user, Object[] ids, AuthorizationType type, String permissionKey) {
+ boolean operationPermissionCheck = resourcePermissionCheckService.operationPermissionCheck(type,
+ type.equals(AuthorizationType.PROJECTS) ? ids : null, user.getId(), permissionKey, logger);
+ boolean resourcePermissionCheck = resourcePermissionCheckService.resourcePermissionCheck(type, ids,
+ user.getUserType().equals(UserType.ADMIN_USER) ? 0 : user.getId(), logger);
return operationPermissionCheck && resourcePermissionCheck;
}
@@ -217,6 +222,6 @@ public class BaseServiceImpl implements BaseService {
@Override
public boolean checkDescriptionLength(String description) {
- return description!=null && description.codePointCount(0, description.length()) > 255;
+ return description != null && description.codePointCount(0, description.length()) > 255;
}
}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ClusterServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ClusterServiceImpl.java
index b7d4e01d5e..cdd40cbc0f 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ClusterServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ClusterServiceImpl.java
@@ -258,7 +258,8 @@ public class ClusterServiceImpl extends BaseServiceImpl implements ClusterServic
.selectCount(new QueryWrapper<K8sNamespace>().lambda().eq(K8sNamespace::getClusterCode, code));
if (relatedNamespaceNumber > 0) {
- logger.warn("Delete cluster failed because {} namespace(s) is(are) using it, clusterCode:{}.", relatedNamespaceNumber, code);
+ logger.warn("Delete cluster failed because {} namespace(s) is(are) using it, clusterCode:{}.",
+ relatedNamespaceNumber, code);
putMsg(result, Status.DELETE_CLUSTER_RELATED_NAMESPACE_EXISTS);
return result;
}
@@ -274,7 +275,6 @@ public class ClusterServiceImpl extends BaseServiceImpl implements ClusterServic
return result;
}
-
/**
* update cluster
*
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/DataAnalysisServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/DataAnalysisServiceImpl.java
index 276e1ddb42..da6b5c156e 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/DataAnalysisServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/DataAnalysisServiceImpl.java
@@ -17,8 +17,8 @@
package org.apache.dolphinscheduler.api.service.impl;
-import org.apache.commons.lang3.StringUtils;
-import org.apache.commons.lang3.tuple.Pair;
+import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.PROJECT_OVERVIEW;
+
import org.apache.dolphinscheduler.api.dto.CommandStateCount;
import org.apache.dolphinscheduler.api.dto.DefineUserDto;
import org.apache.dolphinscheduler.api.dto.TaskCountDto;
@@ -44,10 +44,9 @@ import org.apache.dolphinscheduler.dao.mapper.ProjectMapper;
import org.apache.dolphinscheduler.dao.mapper.TaskInstanceMapper;
import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus;
import org.apache.dolphinscheduler.service.process.ProcessService;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
+
+import org.apache.commons.lang3.StringUtils;
+import org.apache.commons.lang3.tuple.Pair;
import java.util.ArrayList;
import java.util.Arrays;
@@ -60,7 +59,10 @@ import java.util.Optional;
import java.util.Set;
import java.util.stream.Collectors;
-import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.PROJECT_OVERVIEW;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
/**
* data analysis service impl
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/DataSourceServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/DataSourceServiceImpl.java
index 808f85311d..6547d83490 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/DataSourceServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/DataSourceServiceImpl.java
@@ -71,8 +71,6 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.fasterxml.jackson.databind.node.ObjectNode;
-
-
/**
* data source service impl
*/
@@ -87,7 +85,6 @@ public class DataSourceServiceImpl extends BaseServiceImpl implements DataSource
@Autowired
private DataSourceUserMapper datasourceUserMapper;
-
private static final String TABLE = "TABLE";
private static final String VIEW = "VIEW";
private static final String[] TABLE_TYPES = new String[]{TABLE, VIEW};
@@ -106,7 +103,8 @@ public class DataSourceServiceImpl extends BaseServiceImpl implements DataSource
public Result<Object> createDataSource(User loginUser, BaseDataSourceParamDTO datasourceParam) {
DataSourceUtils.checkDatasourceParam(datasourceParam);
Result<Object> result = new Result<>();
- if (!canOperatorPermissions(loginUser,null, AuthorizationType.DATASOURCE, ApiFuncIdentificationConstant.DATASOURCE_CREATE_DATASOURCE)) {
+ if (!canOperatorPermissions(loginUser, null, AuthorizationType.DATASOURCE,
+ ApiFuncIdentificationConstant.DATASOURCE_CREATE_DATASOURCE)) {
putMsg(result, Status.USER_NO_OPERATION_PERM);
return result;
}
@@ -116,7 +114,7 @@ public class DataSourceServiceImpl extends BaseServiceImpl implements DataSource
putMsg(result, Status.DATASOURCE_EXIST);
return result;
}
- if(checkDescriptionLength(datasourceParam.getNote())){
+ if (checkDescriptionLength(datasourceParam.getNote())) {
logger.warn("Parameter description is too long, description:{}.", datasourceParam.getNote());
putMsg(result, Status.DESCRIPTION_TOO_LONG_ERROR);
return result;
@@ -146,8 +144,10 @@ public class DataSourceServiceImpl extends BaseServiceImpl implements DataSource
try {
dataSourceMapper.insert(dataSource);
putMsg(result, Status.SUCCESS);
- permissionPostHandle(AuthorizationType.DATASOURCE, loginUser.getId(), Collections.singletonList(dataSource.getId()), logger);
- logger.info("Datasource create complete, dbType:{}, datasourceName:{}.", dataSource.getType().getDescp(), dataSource.getName());
+ permissionPostHandle(AuthorizationType.DATASOURCE, loginUser.getId(),
+ Collections.singletonList(dataSource.getId()), logger);
+ logger.info("Datasource create complete, dbType:{}, datasourceName:{}.", dataSource.getType().getDescp(),
+ dataSource.getName());
} catch (DuplicateKeyException ex) {
logger.error("Datasource create error.", ex);
putMsg(result, Status.DATASOURCE_EXIST);
@@ -175,24 +175,26 @@ public class DataSourceServiceImpl extends BaseServiceImpl implements DataSource
return result;
}
- if (!canOperatorPermissions(loginUser,new Object[]{dataSource.getId()}, AuthorizationType.DATASOURCE, DATASOURCE_UPDATE)) {
+ if (!canOperatorPermissions(loginUser, new Object[]{dataSource.getId()}, AuthorizationType.DATASOURCE,
+ DATASOURCE_UPDATE)) {
putMsg(result, Status.USER_NO_OPERATION_PERM);
return result;
}
- //check name can use or not
+ // check name can use or not
if (!dataSource.getName().trim().equals(dataSource.getName()) && checkName(dataSource.getName())) {
logger.warn("Datasource with the same name already exists, name:{}.", dataSource.getName());
putMsg(result, Status.DATASOURCE_EXIST);
return result;
}
- if(checkDescriptionLength(dataSourceParam.getNote())){
+ if (checkDescriptionLength(dataSourceParam.getNote())) {
logger.warn("Parameter description is too long, description:{}.", dataSourceParam.getNote());
putMsg(result, Status.DESCRIPTION_TOO_LONG_ERROR);
return result;
}
- //check password，if the password is not updated, set to the old password.
- BaseConnectionParam connectionParam = (BaseConnectionParam) DataSourceUtils.buildConnectionParams(dataSourceParam);
+ // check password，if the password is not updated, set to the old password.
+ BaseConnectionParam connectionParam =
+ (BaseConnectionParam) DataSourceUtils.buildConnectionParams(dataSourceParam);
String password = connectionParam.getPassword();
if (StringUtils.isBlank(password)) {
String oldConnectionParams = dataSource.getConnectionParams();
@@ -213,17 +215,19 @@ public class DataSourceServiceImpl extends BaseServiceImpl implements DataSource
dataSource.setType(dataSource.getType());
dataSource.setConnectionParams(JSONUtils.toJsonString(connectionParam));
dataSource.setUpdateTime(now);
- if(dataSource.getTestFlag() == 1 && dataSourceParam.getTestFlag() == 0){
+ if (dataSource.getTestFlag() == 1 && dataSourceParam.getTestFlag() == 0) {
clearBindTestId(id);
}
dataSource.setTestFlag(dataSourceParam.getTestFlag());
dataSource.setBindTestId(dataSourceParam.getBindTestId());
try {
dataSourceMapper.updateById(dataSource);
- logger.info("Update datasource complete, datasourceId:{}, datasourceName:{}.", dataSource.getId(), dataSource.getName());
+ logger.info("Update datasource complete, datasourceId:{}, datasourceName:{}.", dataSource.getId(),
+ dataSource.getName());
putMsg(result, Status.SUCCESS);
} catch (DuplicateKeyException ex) {
- logger.error("Update datasource error, datasourceId:{}, datasourceName:{}.", dataSource.getId(), dataSource.getName());
+ logger.error("Update datasource error, datasourceId:{}, datasourceName:{}.", dataSource.getId(),
+ dataSource.getName());
putMsg(result, Status.DATASOURCE_EXIST);
}
return result;
@@ -279,9 +283,11 @@ public class DataSourceServiceImpl extends BaseServiceImpl implements DataSource
Page<DataSource> dataSourcePage = new Page<>(pageNo, pageSize);
PageInfo<DataSource> pageInfo = new PageInfo<>(pageNo, pageSize);
if (loginUser.getUserType().equals(UserType.ADMIN_USER)) {
- dataSourceList = dataSourceMapper.selectPaging(dataSourcePage, UserType.ADMIN_USER.equals(loginUser.getUserType()) ? 0 : loginUser.getId(), searchVal);
+ dataSourceList = dataSourceMapper.selectPaging(dataSourcePage,
+ UserType.ADMIN_USER.equals(loginUser.getUserType()) ? 0 : loginUser.getId(), searchVal);
} else {
- Set<Integer> ids = resourcePermissionCheckService.userOwnedResourceIdsAcquisition(AuthorizationType.DATASOURCE, loginUser.getId(), logger);
+ Set<Integer> ids = resourcePermissionCheckService
+ .userOwnedResourceIdsAcquisition(AuthorizationType.DATASOURCE, loginUser.getId(), logger);
if (ids.isEmpty()) {
result.setData(pageInfo);
putMsg(result, Status.SUCCESS);
@@ -335,13 +341,16 @@ public class DataSourceServiceImpl extends BaseServiceImpl implements DataSource
if (loginUser.getUserType().equals(UserType.ADMIN_USER)) {
datasourceList = dataSourceMapper.queryDataSourceByType(0, type, testFlag);
} else {
- Set<Integer> ids = resourcePermissionCheckService.userOwnedResourceIdsAcquisition(AuthorizationType.DATASOURCE, loginUser.getId(), logger);
+ Set<Integer> ids = resourcePermissionCheckService
+ .userOwnedResourceIdsAcquisition(AuthorizationType.DATASOURCE, loginUser.getId(), logger);
if (ids.isEmpty()) {
result.put(Constants.DATA_LIST, Collections.emptyList());
putMsg(result, Status.SUCCESS);
return result;
}
- datasourceList = dataSourceMapper.selectBatchIds(ids).stream().filter(dataSource -> dataSource.getType().getCode() == type).filter(dataSource -> dataSource.getTestFlag() == testFlag).collect(Collectors.toList());
+ datasourceList = dataSourceMapper.selectBatchIds(ids).stream()
+ .filter(dataSource -> dataSource.getType().getCode() == type)
+ .filter(dataSource -> dataSource.getTestFlag() == testFlag).collect(Collectors.toList());
}
result.put(Constants.DATA_LIST, datasourceList);
@@ -360,7 +369,8 @@ public class DataSourceServiceImpl extends BaseServiceImpl implements DataSource
Result<Object> result = new Result<>();
List<DataSource> dataSourceList = dataSourceMapper.queryDataSourceByName(name);
if (dataSourceList != null && !dataSourceList.isEmpty()) {
- logger.warn("Datasource with the same name already exists, dataSourceName:{}.", dataSourceList.get(0).getName());
+ logger.warn("Datasource with the same name already exists, dataSourceName:{}.",
+ dataSourceList.get(0).getName());
putMsg(result, Status.DATASOURCE_EXIST);
} else {
putMsg(result, Status.SUCCESS);
@@ -382,18 +392,21 @@ public class DataSourceServiceImpl extends BaseServiceImpl implements DataSource
Result<Object> result = new Result<>();
try (Connection connection = DataSourceClientProvider.getInstance().getConnection(type, connectionParam)) {
if (connection == null) {
- logger.error("Connection test to {} datasource failed, connectionParam:{}.", type.getDescp(), connectionParam);
+ logger.error("Connection test to {} datasource failed, connectionParam:{}.", type.getDescp(),
+ connectionParam);
putMsg(result, Status.CONNECTION_TEST_FAILURE);
return result;
}
- logger.info("Connection test to {} datasource success, connectionParam:{}", type.getDescp(), connectionParam);
+ logger.info("Connection test to {} datasource success, connectionParam:{}", type.getDescp(),
+ connectionParam);
putMsg(result, Status.SUCCESS);
return result;
} catch (Exception e) {
String message = Optional.of(e).map(Throwable::getCause)
.map(Throwable::getMessage)
.orElse(e.getMessage());
- logger.error("Datasource test connection error, dbType:{}, connectionParam:{}, message:{}.", type, connectionParam, message);
+ logger.error("Datasource test connection error, dbType:{}, connectionParam:{}, message:{}.", type,
+ connectionParam, message);
return new Result<>(Status.CONNECTION_TEST_FAILURE.getCode(), message);
}
}
@@ -413,7 +426,8 @@ public class DataSourceServiceImpl extends BaseServiceImpl implements DataSource
putMsg(result, Status.RESOURCE_NOT_EXIST);
return result;
}
- return checkConnection(dataSource.getType(), DataSourceUtils.buildConnectionParams(dataSource.getType(), dataSource.getConnectionParams()));
+ return checkConnection(dataSource.getType(),
+ DataSourceUtils.buildConnectionParams(dataSource.getType(), dataSource.getConnectionParams()));
}
/**
@@ -428,14 +442,15 @@ public class DataSourceServiceImpl extends BaseServiceImpl implements DataSource
public Result<Object> delete(User loginUser, int datasourceId) {
Result<Object> result = new Result<>();
try {
- //query datasource by id
+ // query datasource by id
DataSource dataSource = dataSourceMapper.selectById(datasourceId);
if (dataSource == null) {
logger.warn("Datasource does not exist, datasourceId:{}.", datasourceId);
putMsg(result, Status.RESOURCE_NOT_EXIST);
return result;
}
- if (!canOperatorPermissions(loginUser, new Object[]{dataSource.getId()},AuthorizationType.DATASOURCE,DATASOURCE_DELETE)) {
+ if (!canOperatorPermissions(loginUser, new Object[]{dataSource.getId()}, AuthorizationType.DATASOURCE,
+ DATASOURCE_DELETE)) {
putMsg(result, Status.USER_NO_OPERATION_PERM);
return result;
}
@@ -462,7 +477,7 @@ public class DataSourceServiceImpl extends BaseServiceImpl implements DataSource
public Map<String, Object> unauthDatasource(User loginUser, Integer userId) {
Map<String, Object> result = new HashMap<>();
List<DataSource> datasourceList;
- if (canOperatorPermissions(loginUser,null,AuthorizationType.DATASOURCE,null)) {
+ if (canOperatorPermissions(loginUser, null, AuthorizationType.DATASOURCE, null)) {
// admin gets all data sources except userId
datasourceList = dataSourceMapper.queryDatasourceExceptUserId(userId);
} else {
@@ -543,7 +558,7 @@ public class DataSourceServiceImpl extends BaseServiceImpl implements DataSource
tables = metaData.getTables(
connectionParam.getDatabase(),
- getDbSchemaPattern(dataSource.getType(),schema,connectionParam),
+ getDbSchemaPattern(dataSource.getType(), schema, connectionParam),
"%", TABLE_TYPES);
if (null == tables) {
logger.error("Get datasource tables error, datasourceId:{}.", datasourceId);
@@ -574,7 +589,7 @@ public class DataSourceServiceImpl extends BaseServiceImpl implements DataSource
}
@Override
- public Map<String, Object> getTableColumns(Integer datasourceId,String tableName) {
+ public Map<String, Object> getTableColumns(Integer datasourceId, String tableName) {
Map<String, Object> result = new HashMap<>();
DataSource dataSource = dataSourceMapper.selectById(datasourceId);
@@ -640,7 +655,7 @@ public class DataSourceServiceImpl extends BaseServiceImpl implements DataSource
return options;
}
- private String getDbSchemaPattern(DbType dbType,String schema,BaseConnectionParam connectionParam) {
+ private String getDbSchemaPattern(DbType dbType, String schema, BaseConnectionParam connectionParam) {
if (dbType == null) {
return null;
}
@@ -689,7 +704,7 @@ public class DataSourceServiceImpl extends BaseServiceImpl implements DataSource
}
}
}
- private void clearBindTestId(Integer bindTestId){
+ private void clearBindTestId(Integer bindTestId) {
dataSourceMapper.clearBindTestId(bindTestId);
}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/DqExecuteResultServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/DqExecuteResultServiceImpl.java
index 417103f9f3..7d16d3d4d1 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/DqExecuteResultServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/DqExecuteResultServiceImpl.java
@@ -21,7 +21,6 @@ import org.apache.dolphinscheduler.api.enums.Status;
import org.apache.dolphinscheduler.api.service.DqExecuteResultService;
import org.apache.dolphinscheduler.api.utils.PageInfo;
import org.apache.dolphinscheduler.api.utils.Result;
-import org.apache.dolphinscheduler.common.enums.AuthorizationType;
import org.apache.dolphinscheduler.common.utils.DateUtils;
import org.apache.dolphinscheduler.dao.entity.DqExecuteResult;
import org.apache.dolphinscheduler.dao.entity.User;
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/EnvironmentServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/EnvironmentServiceImpl.java
index 0f5efcfa3b..4023843c4b 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/EnvironmentServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/EnvironmentServiceImpl.java
@@ -17,7 +17,9 @@
package org.apache.dolphinscheduler.api.service.impl;
-import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.*;
+import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.ENVIRONMENT_CREATE;
+import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.ENVIRONMENT_DELETE;
+import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.ENVIRONMENT_UPDATE;
import org.apache.dolphinscheduler.api.dto.EnvironmentDto;
import org.apache.dolphinscheduler.api.enums.Status;
@@ -151,7 +153,8 @@ public class EnvironmentServiceImpl extends BaseServiceImpl implements Environme
relation.setCreateTime(new Date());
relation.setUpdateTime(new Date());
relationMapper.insert(relation);
- logger.info("Environment-WorkerGroup relation create complete, environmentName:{}, workerGroup:{}.",
+ logger.info(
+ "Environment-WorkerGroup relation create complete, environmentName:{}, workerGroup:{}.",
env.getName(), relation.getWorkerGroup());
}
});
@@ -159,7 +162,8 @@ public class EnvironmentServiceImpl extends BaseServiceImpl implements Environme
}
result.put(Constants.DATA_LIST, env.getCode());
putMsg(result, Status.SUCCESS);
- permissionPostHandle(AuthorizationType.ENVIRONMENT, loginUser.getId(), Collections.singletonList(env.getId()), logger);
+ permissionPostHandle(AuthorizationType.ENVIRONMENT, loginUser.getId(),
+ Collections.singletonList(env.getId()), logger);
logger.info("Environment create complete, name:{}.", env.getName());
} else {
logger.error("Environment create error, name:{}.", env.getName());
@@ -186,7 +190,8 @@ public class EnvironmentServiceImpl extends BaseServiceImpl implements Environme
if (loginUser.getUserType().equals(UserType.ADMIN_USER)) {
environmentIPage = environmentMapper.queryEnvironmentListPaging(page, searchVal);
} else {
- Set<Integer> ids = resourcePermissionCheckService.userOwnedResourceIdsAcquisition(AuthorizationType.ENVIRONMENT, loginUser.getId(), logger);
+ Set<Integer> ids = resourcePermissionCheckService
+ .userOwnedResourceIdsAcquisition(AuthorizationType.ENVIRONMENT, loginUser.getId(), logger);
if (ids.isEmpty()) {
result.setData(pageInfo);
putMsg(result, Status.SUCCESS);
@@ -199,12 +204,13 @@ public class EnvironmentServiceImpl extends BaseServiceImpl implements Environme
if (CollectionUtils.isNotEmpty(environmentIPage.getRecords())) {
Map<Long, List<String>> relationMap = relationMapper.selectList(null).stream()
- .collect(Collectors.groupingBy(EnvironmentWorkerGroupRelation::getEnvironmentCode,Collectors.mapping(EnvironmentWorkerGroupRelation::getWorkerGroup,Collectors.toList())));
+ .collect(Collectors.groupingBy(EnvironmentWorkerGroupRelation::getEnvironmentCode,
+ Collectors.mapping(EnvironmentWorkerGroupRelation::getWorkerGroup, Collectors.toList())));
List<EnvironmentDto> dtoList = environmentIPage.getRecords().stream().map(environment -> {
EnvironmentDto dto = new EnvironmentDto();
- BeanUtils.copyProperties(environment,dto);
- List<String> workerGroups = relationMap.getOrDefault(environment.getCode(),new ArrayList<String>());
+ BeanUtils.copyProperties(environment, dto);
+ List<String> workerGroups = relationMap.getOrDefault(environment.getCode(), new ArrayList<String>());
dto.setWorkerGroups(workerGroups);
return dto;
}).collect(Collectors.toList());
@@ -227,31 +233,33 @@ public class EnvironmentServiceImpl extends BaseServiceImpl implements Environme
*/
@Override
public Map<String, Object> queryAllEnvironmentList(User loginUser) {
- Map<String,Object> result = new HashMap<>();
- Set<Integer> ids = resourcePermissionCheckService.userOwnedResourceIdsAcquisition(AuthorizationType.ENVIRONMENT, loginUser.getId(), logger);
+ Map<String, Object> result = new HashMap<>();
+ Set<Integer> ids = resourcePermissionCheckService.userOwnedResourceIdsAcquisition(AuthorizationType.ENVIRONMENT,
+ loginUser.getId(), logger);
if (ids.isEmpty()) {
result.put(Constants.DATA_LIST, Collections.emptyList());
- putMsg(result,Status.SUCCESS);
+ putMsg(result, Status.SUCCESS);
return result;
}
List<Environment> environmentList = environmentMapper.selectBatchIds(ids);
if (CollectionUtils.isNotEmpty(environmentList)) {
Map<Long, List<String>> relationMap = relationMapper.selectList(null).stream()
- .collect(Collectors.groupingBy(EnvironmentWorkerGroupRelation::getEnvironmentCode,Collectors.mapping(EnvironmentWorkerGroupRelation::getWorkerGroup,Collectors.toList())));
+ .collect(Collectors.groupingBy(EnvironmentWorkerGroupRelation::getEnvironmentCode,
+ Collectors.mapping(EnvironmentWorkerGroupRelation::getWorkerGroup, Collectors.toList())));
List<EnvironmentDto> dtoList = environmentList.stream().map(environment -> {
EnvironmentDto dto = new EnvironmentDto();
- BeanUtils.copyProperties(environment,dto);
- List<String> workerGroups = relationMap.getOrDefault(environment.getCode(),new ArrayList<String>());
+ BeanUtils.copyProperties(environment, dto);
+ List<String> workerGroups = relationMap.getOrDefault(environment.getCode(), new ArrayList<String>());
dto.setWorkerGroups(workerGroups);
return dto;
}).collect(Collectors.toList());
- result.put(Constants.DATA_LIST,dtoList);
+ result.put(Constants.DATA_LIST, dtoList);
} else {
result.put(Constants.DATA_LIST, new ArrayList<>());
}
- putMsg(result,Status.SUCCESS);
+ putMsg(result, Status.SUCCESS);
return result;
}
@@ -274,7 +282,7 @@ public class EnvironmentServiceImpl extends BaseServiceImpl implements Environme
.collect(Collectors.toList());
EnvironmentDto dto = new EnvironmentDto();
- BeanUtils.copyProperties(env,dto);
+ BeanUtils.copyProperties(env, dto);
dto.setWorkerGroups(workerGroups);
result.put(Constants.DATA_LIST, dto);
putMsg(result, Status.SUCCESS);
@@ -300,7 +308,7 @@ public class EnvironmentServiceImpl extends BaseServiceImpl implements Environme
.collect(Collectors.toList());
EnvironmentDto dto = new EnvironmentDto();
- BeanUtils.copyProperties(env,dto);
+ BeanUtils.copyProperties(env, dto);
dto.setWorkerGroups(workerGroups);
result.put(Constants.DATA_LIST, dto);
putMsg(result, Status.SUCCESS);
@@ -327,7 +335,8 @@ public class EnvironmentServiceImpl extends BaseServiceImpl implements Environme
.selectCount(new QueryWrapper<TaskDefinition>().lambda().eq(TaskDefinition::getEnvironmentCode, code));
if (relatedTaskNumber > 0) {
- logger.warn("Delete environment failed because {} tasks is using it, environmentCode:{}.", relatedTaskNumber, code);
+ logger.warn("Delete environment failed because {} tasks is using it, environmentCode:{}.",
+ relatedTaskNumber, code);
putMsg(result, Status.DELETE_ENVIRONMENT_RELATED_TASK_EXISTS);
return result;
}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/EnvironmentWorkerGroupRelationServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/EnvironmentWorkerGroupRelationServiceImpl.java
index 7fa7104ebf..51e8fd458c 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/EnvironmentWorkerGroupRelationServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/EnvironmentWorkerGroupRelationServiceImpl.java
@@ -36,8 +36,9 @@ import org.springframework.stereotype.Service;
* task definition service impl
*/
@Service
-public class EnvironmentWorkerGroupRelationServiceImpl extends BaseServiceImpl implements
- EnvironmentWorkerGroupRelationService {
+public class EnvironmentWorkerGroupRelationServiceImpl extends BaseServiceImpl
+ implements
+ EnvironmentWorkerGroupRelationService {
private static final Logger logger = LoggerFactory.getLogger(EnvironmentWorkerGroupRelationServiceImpl.class);
@@ -52,7 +53,8 @@ public class EnvironmentWorkerGroupRelationServiceImpl extends BaseServiceImpl i
@Override
public Map<String, Object> queryEnvironmentWorkerGroupRelation(Long environmentCode) {
Map<String, Object> result = new HashMap<>();
- List<EnvironmentWorkerGroupRelation> relations = environmentWorkerGroupRelationMapper.queryByEnvironmentCode(environmentCode);
+ List<EnvironmentWorkerGroupRelation> relations =
+ environmentWorkerGroupRelationMapper.queryByEnvironmentCode(environmentCode);
result.put(Constants.DATA_LIST, relations);
putMsg(result, Status.SUCCESS);
return result;
@@ -69,8 +71,8 @@ public class EnvironmentWorkerGroupRelationServiceImpl extends BaseServiceImpl i
List<EnvironmentWorkerGroupRelation> relations = environmentWorkerGroupRelationMapper.selectList(null);
- result.put(Constants.DATA_LIST,relations);
- putMsg(result,Status.SUCCESS);
+ result.put(Constants.DATA_LIST, relations);
+ putMsg(result, Status.SUCCESS);
return result;
}
}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/FavTaskServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/FavTaskServiceImpl.java
index f04bf89d3f..21e3737101 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/FavTaskServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/FavTaskServiceImpl.java
@@ -23,13 +23,15 @@ import org.apache.dolphinscheduler.api.service.FavTaskService;
import org.apache.dolphinscheduler.dao.entity.FavTask;
import org.apache.dolphinscheduler.dao.entity.User;
import org.apache.dolphinscheduler.dao.mapper.FavTaskMapper;
-import org.springframework.stereotype.Service;
-import javax.annotation.Resource;
import java.util.ArrayList;
import java.util.List;
import java.util.Set;
+import javax.annotation.Resource;
+
+import org.springframework.stereotype.Service;
+
@Service
public class FavTaskServiceImpl extends BaseServiceImpl implements FavTaskService {
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/K8SNamespaceServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/K8SNamespaceServiceImpl.java
index 97d4a67f2b..7316b3e337 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/K8SNamespaceServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/K8SNamespaceServiceImpl.java
@@ -31,8 +31,8 @@ import org.apache.dolphinscheduler.dao.mapper.ClusterMapper;
import org.apache.dolphinscheduler.dao.mapper.K8sNamespaceMapper;
import org.apache.dolphinscheduler.remote.exceptions.RemotingException;
-import org.apache.commons.lang3.StringUtils;
import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
import java.util.ArrayList;
import java.util.Date;
@@ -445,7 +445,7 @@ public class K8SNamespaceServiceImpl extends BaseServiceImpl implements K8sNames
if (isAdmin(loginUser)) {
k8sNamespaces = k8sNamespaceMapper.selectList(null);
} else {
- k8sNamespaces = k8sNamespaceMapper.queryNamespaceAvailable(loginUser.getId());
+ k8sNamespaces = k8sNamespaceMapper.queryNamespaceAvailable(loginUser.getId());
}
setClusterName(k8sNamespaces);
return k8sNamespaces;
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/LoggerServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/LoggerServiceImpl.java
index e3f83f3c1f..f12fc27cbb 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/LoggerServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/LoggerServiceImpl.java
@@ -17,6 +17,9 @@
package org.apache.dolphinscheduler.api.service.impl;
+import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.DOWNLOAD_LOG;
+import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.VIEW_LOG;
+
import org.apache.dolphinscheduler.api.enums.Status;
import org.apache.dolphinscheduler.api.exceptions.ServiceException;
import org.apache.dolphinscheduler.api.service.LoggerService;
@@ -38,10 +41,6 @@ import org.apache.commons.lang3.StringUtils;
import java.nio.charset.StandardCharsets;
import java.util.Map;
-import java.util.Objects;
-
-import javax.annotation.PostConstruct;
-import javax.annotation.PreDestroy;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -50,9 +49,6 @@ import org.springframework.stereotype.Service;
import com.google.common.primitives.Bytes;
-import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.DOWNLOAD_LOG;
-import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.VIEW_LOG;
-
/**
* logger service impl
*/
@@ -107,7 +103,6 @@ public class LoggerServiceImpl extends BaseServiceImpl implements LoggerService
return result;
}
-
/**
* get log size
*
@@ -137,7 +132,7 @@ public class LoggerServiceImpl extends BaseServiceImpl implements LoggerService
@SuppressWarnings("unchecked")
public Map<String, Object> queryLog(User loginUser, long projectCode, int taskInstId, int skipLineNum, int limit) {
Project project = projectMapper.queryByCode(projectCode);
- //check user access for project
+ // check user access for project
Map<String, Object> result = projectService.checkProjectAndAuth(loginUser, project, projectCode, VIEW_LOG);
if (result.get(Constants.STATUS) != Status.SUCCESS) {
return result;
@@ -170,8 +165,8 @@ public class LoggerServiceImpl extends BaseServiceImpl implements LoggerService
@Override
public byte[] getLogBytes(User loginUser, long projectCode, int taskInstId) {
Project project = projectMapper.queryByCode(projectCode);
- //check user access for project
- Map<String, Object> result = projectService.checkProjectAndAuth(loginUser, project, projectCode,DOWNLOAD_LOG);
+ // check user access for project
+ Map<String, Object> result = projectService.checkProjectAndAuth(loginUser, project, projectCode, DOWNLOAD_LOG);
if (result.get(Constants.STATUS) != Status.SUCCESS) {
throw new ServiceException("user has no permission");
}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/MonitorServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/MonitorServiceImpl.java
index 04debec555..fb10f49cb1 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/MonitorServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/MonitorServiceImpl.java
@@ -97,32 +97,30 @@ public class MonitorServiceImpl extends BaseServiceImpl implements MonitorServic
Map<String, Object> result = new HashMap<>();
List<WorkerServerModel> workerServers = getServerListFromRegistry(false)
- .stream()
- .map((Server server) -> {
- WorkerServerModel model = new WorkerServerModel();
- model.setId(server.getId());
- model.setHost(server.getHost());
- model.setPort(server.getPort());
- model.setZkDirectories(Sets.newHashSet(server.getZkDirectory()));
- model.setResInfo(server.getResInfo());
- model.setCreateTime(server.getCreateTime());
- model.setLastHeartbeatTime(server.getLastHeartbeatTime());
- return model;
- })
- .collect(Collectors.toList());
+ .stream()
+ .map((Server server) -> {
+ WorkerServerModel model = new WorkerServerModel();
+ model.setId(server.getId());
+ model.setHost(server.getHost());
+ model.setPort(server.getPort());
+ model.setZkDirectories(Sets.newHashSet(server.getZkDirectory()));
+ model.setResInfo(server.getResInfo());
+ model.setCreateTime(server.getCreateTime());
+ model.setLastHeartbeatTime(server.getLastHeartbeatTime());
+ return model;
+ })
+ .collect(Collectors.toList());
Map<String, WorkerServerModel> workerHostPortServerMapping = workerServers
- .stream()
- .collect(Collectors.toMap(
- (WorkerServerModel worker) -> {
- String[] s = worker.getZkDirectories().iterator().next().split("/");
- return s[s.length - 1];
- }
- , Function.identity()
- , (WorkerServerModel oldOne, WorkerServerModel newOne) -> {
- oldOne.getZkDirectories().addAll(newOne.getZkDirectories());
- return oldOne;
- }));
+ .stream()
+ .collect(Collectors.toMap(
+ (WorkerServerModel worker) -> {
+ String[] s = worker.getZkDirectories().iterator().next().split("/");
+ return s[s.length - 1];
+ }, Function.identity(), (WorkerServerModel oldOne, WorkerServerModel newOne) -> {
+ oldOne.getZkDirectories().addAll(newOne.getZkDirectories());
+ return oldOne;
+ }));
result.put(Constants.DATA_LIST, workerHostPortServerMapping.values());
putMsg(result, Status.SUCCESS);
@@ -133,8 +131,8 @@ public class MonitorServiceImpl extends BaseServiceImpl implements MonitorServic
@Override
public List<Server> getServerListFromRegistry(boolean isMaster) {
return isMaster
- ? registryClient.getServerList(NodeType.MASTER)
- : registryClient.getServerList(NodeType.WORKER);
+ ? registryClient.getServerList(NodeType.MASTER)
+ : registryClient.getServerList(NodeType.WORKER);
}
}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
index 37659730d1..17979139d5 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
@@ -973,8 +973,7 @@ public class ProcessDefinitionServiceImpl extends BaseServiceImpl implements Pro
diffCode.stream().map(String::valueOf).collect(Collectors.joining(Constants.COMMA)));
throw new ServiceException(Status.BATCH_DELETE_PROCESS_DEFINE_BY_CODES_ERROR,
diffCode.stream().map(code -> code + "[process definition not exist]")
- .collect(Collectors.joining(Constants.COMMA))
- );
+ .collect(Collectors.joining(Constants.COMMA)));
}
for (ProcessDefinition process : processDefinitionList) {
@@ -1003,7 +1002,8 @@ public class ProcessDefinitionServiceImpl extends BaseServiceImpl implements Pro
// check process instances is already running
List<ProcessInstance> processInstances = processInstanceService
- .queryByProcessDefineCodeAndStatus(processDefinition.getCode(), org.apache.dolphinscheduler.service.utils.Constants.NOT_TERMINATED_STATES);
+ .queryByProcessDefineCodeAndStatus(processDefinition.getCode(),
+ org.apache.dolphinscheduler.service.utils.Constants.NOT_TERMINATED_STATES);
if (CollectionUtils.isNotEmpty(processInstances)) {
throw new ServiceException(Status.DELETE_PROCESS_DEFINITION_EXECUTING_FAIL, processInstances.size());
}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java
index 4f146a8c2f..b969ea6dcc 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java
@@ -17,10 +17,20 @@
package org.apache.dolphinscheduler.api.service.impl;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.apache.commons.lang3.StringUtils;
+import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.INSTANCE_DELETE;
+import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.INSTANCE_UPDATE;
+import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.WORKFLOW_INSTANCE;
+import static org.apache.dolphinscheduler.api.enums.Status.PROCESS_INSTANCE_NOT_EXIST;
+import static org.apache.dolphinscheduler.api.enums.Status.PROCESS_INSTANCE_STATE_OPERATION_ERROR;
+import static org.apache.dolphinscheduler.common.Constants.DATA_LIST;
+import static org.apache.dolphinscheduler.common.Constants.DEPENDENT_SPLIT;
+import static org.apache.dolphinscheduler.common.Constants.GLOBAL_PARAMS;
+import static org.apache.dolphinscheduler.common.Constants.LOCAL_PARAMS;
+import static org.apache.dolphinscheduler.common.Constants.PROCESS_INSTANCE_STATE;
+import static org.apache.dolphinscheduler.common.Constants.TASK_LIST;
+import static org.apache.dolphinscheduler.plugin.task.api.TaskConstants.TASK_TYPE_DEPENDENT;
+import static org.apache.dolphinscheduler.plugin.task.api.TaskConstants.TASK_TYPE_SUB_PROCESS;
+
import org.apache.dolphinscheduler.api.dto.gantt.GanttDto;
import org.apache.dolphinscheduler.api.dto.gantt.Task;
import org.apache.dolphinscheduler.api.enums.Status;
@@ -40,7 +50,6 @@ import org.apache.dolphinscheduler.common.graph.DAG;
import org.apache.dolphinscheduler.common.model.TaskNodeRelation;
import org.apache.dolphinscheduler.common.utils.DateUtils;
import org.apache.dolphinscheduler.common.utils.JSONUtils;
-import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
import org.apache.dolphinscheduler.common.utils.placeholder.BusinessTimeUtils;
import org.apache.dolphinscheduler.dao.entity.ProcessDefinition;
import org.apache.dolphinscheduler.dao.entity.ProcessInstance;
@@ -66,16 +75,13 @@ import org.apache.dolphinscheduler.dao.utils.WorkflowUtils;
import org.apache.dolphinscheduler.plugin.task.api.enums.DependResult;
import org.apache.dolphinscheduler.plugin.task.api.model.Property;
import org.apache.dolphinscheduler.plugin.task.api.parameters.ParametersNode;
+import org.apache.dolphinscheduler.plugin.task.api.utils.ParameterUtils;
import org.apache.dolphinscheduler.service.expand.CuringParamsService;
import org.apache.dolphinscheduler.service.model.TaskNode;
import org.apache.dolphinscheduler.service.process.ProcessService;
import org.apache.dolphinscheduler.service.task.TaskPluginManager;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.apache.commons.lang3.StringUtils;
import java.io.BufferedReader;
import java.io.ByteArrayInputStream;
@@ -92,20 +98,15 @@ import java.util.Objects;
import java.util.function.Function;
import java.util.stream.Collectors;
-import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.INSTANCE_DELETE;
-import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.INSTANCE_UPDATE;
-import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.WORKFLOW_INSTANCE;
-import static org.apache.dolphinscheduler.api.enums.Status.PROCESS_INSTANCE_NOT_EXIST;
-import static org.apache.dolphinscheduler.api.enums.Status.PROCESS_INSTANCE_STATE_OPERATION_ERROR;
-import static org.apache.dolphinscheduler.common.Constants.DATA_LIST;
-import static org.apache.dolphinscheduler.common.Constants.DEPENDENT_SPLIT;
-import static org.apache.dolphinscheduler.common.Constants.GLOBAL_PARAMS;
-import static org.apache.dolphinscheduler.common.Constants.LOCAL_PARAMS;
-import static org.apache.dolphinscheduler.common.Constants.PROCESS_INSTANCE_STATE;
-import static org.apache.dolphinscheduler.common.Constants.TASK_LIST;
-import static org.apache.dolphinscheduler.plugin.task.api.TaskConstants.TASK_TYPE_DEPENDENT;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
-import static org.apache.dolphinscheduler.plugin.task.api.TaskConstants.TASK_TYPE_SUB_PROCESS;
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
/**
* process instance service impl
@@ -348,20 +349,24 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce
public Map<String, Object> queryTaskListByProcessId(User loginUser, long projectCode,
Integer processId) throws IOException {
Project project = projectMapper.queryByCode(projectCode);
- //check user access for project
- Map<String, Object> result = projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_INSTANCE);
+ // check user access for project
+ Map<String, Object> result =
+ projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_INSTANCE);
if (result.get(Constants.STATUS) != Status.SUCCESS) {
return result;
}
ProcessInstance processInstance = processService.findProcessInstanceDetailById(processId)
.orElseThrow(() -> new ServiceException(PROCESS_INSTANCE_NOT_EXIST, processId));
- ProcessDefinition processDefinition = processDefineMapper.queryByCode(processInstance.getProcessDefinitionCode());
+ ProcessDefinition processDefinition =
+ processDefineMapper.queryByCode(processInstance.getProcessDefinitionCode());
if (processDefinition != null && projectCode != processDefinition.getProjectCode()) {
- logger.error("Process definition does not exist, projectCode:{}, processDefinitionId:{}.", projectCode, processId);
+ logger.error("Process definition does not exist, projectCode:{}, processDefinitionId:{}.", projectCode,
+ processId);
putMsg(result, PROCESS_INSTANCE_NOT_EXIST, processId);
return result;
}
- List<TaskInstance> taskInstanceList = processService.findValidTaskListByProcessId(processId, processInstance.getTestFlag());
+ List<TaskInstance> taskInstanceList =
+ processService.findValidTaskListByProcessId(processId, processInstance.getTestFlag());
addDependResultForTaskList(taskInstanceList);
Map<String, Object> resultMap = new HashMap<>();
resultMap.put(PROCESS_INSTANCE_STATE, processInstance.getState().toString());
@@ -378,7 +383,8 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce
private void addDependResultForTaskList(List<TaskInstance> taskInstanceList) throws IOException {
for (TaskInstance taskInstance : taskInstanceList) {
if (TASK_TYPE_DEPENDENT.equalsIgnoreCase(taskInstance.getTaskType())) {
- logger.info("DEPENDENT type task instance need to set dependent result, taskCode:{}, taskInstanceId:{}", taskInstance.getTaskCode(), taskInstance.getId());
+ logger.info("DEPENDENT type task instance need to set dependent result, taskCode:{}, taskInstanceId:{}",
+ taskInstance.getTaskCode(), taskInstance.getId());
Result<ResponseTaskLog> logResult = loggerService.queryLog(
taskInstance.getId(), Constants.LOG_QUERY_SKIP_LINE_NUMBER, Constants.LOG_QUERY_LIMIT);
if (logResult.getCode() == Status.SUCCESS.ordinal()) {
@@ -447,13 +453,15 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce
TaskDefinition taskDefinition = taskDefinitionMapper.queryByCode(taskInstance.getTaskCode());
if (taskDefinition != null && projectCode != taskDefinition.getProjectCode()) {
- logger.error("Task definition does not exist, projectCode:{}, taskDefinitionCode:{}.", projectCode, taskInstance.getTaskCode());
+ logger.error("Task definition does not exist, projectCode:{}, taskDefinitionCode:{}.", projectCode,
+ taskInstance.getTaskCode());
putMsg(result, Status.TASK_INSTANCE_NOT_EXISTS, taskId);
return result;
}
if (!taskInstance.isSubProcess()) {
- logger.warn("Task instance is not {} type instance, projectCode:{}, taskInstanceId:{}.", TASK_TYPE_SUB_PROCESS, projectCode, taskId);
+ logger.warn("Task instance is not {} type instance, projectCode:{}, taskInstanceId:{}.",
+ TASK_TYPE_SUB_PROCESS, projectCode, taskId);
putMsg(result, Status.TASK_INSTANCE_NOT_SUB_WORKFLOW_INSTANCE, taskInstance.getName());
return result;
}
@@ -461,7 +469,8 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce
ProcessInstance subWorkflowInstance = processService.findSubProcessInstance(
taskInstance.getProcessInstanceId(), taskInstance.getId());
if (subWorkflowInstance == null) {
- logger.error("SubProcess instance does not exist, projectCode:{}, taskInstanceId:{}.", projectCode, taskInstance.getId());
+ logger.error("SubProcess instance does not exist, projectCode:{}, taskInstanceId:{}.", projectCode,
+ taskInstance.getId());
putMsg(result, Status.SUB_PROCESS_INSTANCE_NOT_EXIST, taskId);
return result;
}
@@ -496,8 +505,9 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce
String globalParams,
String locations, int timeout, String tenantCode) {
Project project = projectMapper.queryByCode(projectCode);
- //check user access for project
- Map<String, Object> result = projectService.checkProjectAndAuth(loginUser, project, projectCode, INSTANCE_UPDATE);
+ // check user access for project
+ Map<String, Object> result =
+ projectService.checkProjectAndAuth(loginUser, project, projectCode, INSTANCE_UPDATE);
if (result.get(Constants.STATUS) != Status.SUCCESS) {
return result;
}
@@ -505,15 +515,18 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce
ProcessInstance processInstance = processService.findProcessInstanceDetailById(processInstanceId)
.orElseThrow(() -> new ServiceException(PROCESS_INSTANCE_NOT_EXIST, processInstanceId));
// check process instance exists in project
- ProcessDefinition processDefinition0 = processDefineMapper.queryByCode(processInstance.getProcessDefinitionCode());
+ ProcessDefinition processDefinition0 =
+ processDefineMapper.queryByCode(processInstance.getProcessDefinitionCode());
if (processDefinition0 != null && projectCode != processDefinition0.getProjectCode()) {
- logger.error("Process definition does not exist, projectCode:{}, processDefinitionCode:{}.", projectCode, processInstance.getProcessDefinitionCode());
+ logger.error("Process definition does not exist, projectCode:{}, processDefinitionCode:{}.", projectCode,
+ processInstance.getProcessDefinitionCode());
putMsg(result, PROCESS_INSTANCE_NOT_EXIST, processInstanceId);
return result;
}
- //check process instance status
+ // check process instance status
if (!processInstance.getState().isFinished()) {
- logger.warn("Process Instance state is {} so can not update process instance, processInstanceId:{}.", processInstance.getState().getDesc(), processInstanceId);
+ logger.warn("Process Instance state is {} so can not update process instance, processInstanceId:{}.",
+ processInstance.getState().getDesc(), processInstanceId);
putMsg(result, PROCESS_INSTANCE_STATE_OPERATION_ERROR,
processInstance.getName(), processInstance.getState().toString(), "update");
return result;
@@ -548,7 +561,8 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce
}
int saveTaskResult = processService.saveTaskDefine(loginUser, projectCode, taskDefinitionLogs, syncDefine);
if (saveTaskResult == Constants.DEFINITION_FAILURE) {
- logger.error("Update task definition error, projectCode:{}, processInstanceId:{}", projectCode, processInstanceId);
+ logger.error("Update task definition error, projectCode:{}, processInstanceId:{}", projectCode,
+ processInstanceId);
putMsg(result, Status.UPDATE_TASK_DEFINITION_ERROR);
throw new ServiceException(Status.UPDATE_TASK_DEFINITION_ERROR);
}
@@ -576,20 +590,24 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce
processDefinition.setUpdateTime(new Date());
int insertVersion = processService.saveProcessDefine(loginUser, processDefinition, syncDefine, Boolean.FALSE);
if (insertVersion == 0) {
- logger.error("Update process definition error, projectCode:{}, processDefinitionName:{}.", projectCode, processDefinition.getName());
+ logger.error("Update process definition error, projectCode:{}, processDefinitionName:{}.", projectCode,
+ processDefinition.getName());
putMsg(result, Status.UPDATE_PROCESS_DEFINITION_ERROR);
throw new ServiceException(Status.UPDATE_PROCESS_DEFINITION_ERROR);
} else
- logger.info("Update process definition complete, projectCode:{}, processDefinitionName:{}.", projectCode, processDefinition.getName());
+ logger.info("Update process definition complete, projectCode:{}, processDefinitionName:{}.", projectCode,
+ processDefinition.getName());
int insertResult = processService.saveTaskRelation(loginUser, processDefinition.getProjectCode(),
processDefinition.getCode(), insertVersion, taskRelationList, taskDefinitionLogs, syncDefine);
if (insertResult == Constants.EXIT_CODE_SUCCESS) {
- logger.info("Update task relations complete, projectCode:{}, processDefinitionCode:{}, processDefinitionVersion:{}.",
+ logger.info(
+ "Update task relations complete, projectCode:{}, processDefinitionCode:{}, processDefinitionVersion:{}.",
projectCode, processDefinition.getCode(), insertVersion);
putMsg(result, Status.SUCCESS);
result.put(Constants.DATA_LIST, processDefinition);
} else {
- logger.info("Update task relations error, projectCode:{}, processDefinitionCode:{}, processDefinitionVersion:{}.",
+ logger.info(
+ "Update task relations error, projectCode:{}, processDefinitionCode:{}, processDefinitionVersion:{}.",
projectCode, processDefinition.getCode(), insertVersion);
putMsg(result, Status.UPDATE_PROCESS_DEFINITION_ERROR);
throw new ServiceException(Status.UPDATE_PROCESS_DEFINITION_ERROR);
@@ -597,12 +615,14 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce
processInstance.setProcessDefinitionVersion(insertVersion);
int update = processInstanceDao.updateProcessInstance(processInstance);
if (update == 0) {
- logger.error("Update process instance version error, projectCode:{}, processDefinitionCode:{}, processDefinitionVersion:{}",
+ logger.error(
+ "Update process instance version error, projectCode:{}, processDefinitionCode:{}, processDefinitionVersion:{}",
projectCode, processDefinition.getCode(), insertVersion);
putMsg(result, Status.UPDATE_PROCESS_INSTANCE_ERROR);
throw new ServiceException(Status.UPDATE_PROCESS_INSTANCE_ERROR);
}
- logger.info("Update process instance complete, projectCode:{}, processDefinitionCode:{}, processDefinitionVersion:{}, processInstanceId:{}",
+ logger.info(
+ "Update process instance complete, projectCode:{}, processDefinitionCode:{}, processDefinitionVersion:{}, processInstanceId:{}",
projectCode, processDefinition.getCode(), insertVersion, processInstanceId);
putMsg(result, Status.SUCCESS);
return result;
@@ -649,14 +669,17 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce
ProcessInstance subInstance = processService.findProcessInstanceDetailById(subId)
.orElseThrow(() -> new ServiceException(PROCESS_INSTANCE_NOT_EXIST, subId));
if (subInstance.getIsSubProcess() == Flag.NO) {
- logger.warn("Process instance is not sub process instance type, processInstanceId:{}, processInstanceName:{}.", subId, subInstance.getName());
+ logger.warn(
+ "Process instance is not sub process instance type, processInstanceId:{}, processInstanceName:{}.",
+ subId, subInstance.getName());
putMsg(result, Status.PROCESS_INSTANCE_NOT_SUB_PROCESS_INSTANCE, subInstance.getName());
return result;
}
ProcessInstance parentWorkflowInstance = processService.findParentProcessInstance(subId);
if (parentWorkflowInstance == null) {
- logger.error("Parent process instance does not exist, projectCode:{}, subProcessInstanceId:{}.", projectCode, subId);
+ logger.error("Parent process instance does not exist, projectCode:{}, subProcessInstanceId:{}.",
+ projectCode, subId);
putMsg(result, Status.SUB_PROCESS_INSTANCE_NOT_EXIST);
return result;
}
@@ -691,7 +714,8 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce
if (!processInstance.getState().isFinished()) {
logger.warn("Process Instance state is {} so can not delete process instance, processInstanceId:{}.",
processInstance.getState().getDesc(), processInstanceId);
- throw new ServiceException(PROCESS_INSTANCE_STATE_OPERATION_ERROR, processInstance.getName(), processInstance.getState(), "delete");
+ throw new ServiceException(PROCESS_INSTANCE_STATE_OPERATION_ERROR, processInstance.getName(),
+ processInstance.getState(), "delete");
}
ProcessDefinition processDefinition =
@@ -706,7 +730,8 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce
processService.removeTaskLogFile(processInstanceId);
} catch (Exception ignore) {
// ignore
- logger.warn("Remove task log file exception, projectCode:{}, ProcessDefinitionCode{}, processInstanceId:{}.",
+ logger.warn(
+ "Remove task log file exception, projectCode:{}, ProcessDefinitionCode{}, processInstanceId:{}.",
projectCode, processInstance.getProcessDefinitionCode(), processInstanceId);
}
@@ -718,11 +743,13 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce
processService.deleteWorkTaskInstanceByProcessInstanceId(processInstanceId);
if (delete > 0) {
- logger.info("Delete process instance complete, projectCode:{}, ProcessDefinitionCode{}, processInstanceId:{}.",
+ logger.info(
+ "Delete process instance complete, projectCode:{}, ProcessDefinitionCode{}, processInstanceId:{}.",
projectCode, processInstance.getProcessDefinitionCode(), processInstanceId);
putMsg(result, Status.SUCCESS);
} else {
- logger.error("Delete process instance error, projectCode:{}, ProcessDefinitionCode{}, processInstanceId:{}.",
+ logger.error(
+ "Delete process instance error, projectCode:{}, ProcessDefinitionCode{}, processInstanceId:{}.",
projectCode, processInstance.getProcessDefinitionCode(), processInstanceId);
putMsg(result, Status.DELETE_PROCESS_INSTANCE_BY_ID_ERROR);
throw new ServiceException(Status.DELETE_PROCESS_INSTANCE_BY_ID_ERROR);
@@ -745,7 +772,8 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce
ProcessInstance processInstance = processInstanceMapper.queryDetailById(processInstanceId);
if (processInstance == null) {
- logger.error("Process instance does not exist, projectCode:{}, processInstanceId:{}.", projectCode, processInstanceId);
+ logger.error("Process instance does not exist, projectCode:{}, processInstanceId:{}.", projectCode,
+ processInstanceId);
putMsg(result, Status.PROCESS_INSTANCE_NOT_EXIST, processInstanceId);
return result;
}
@@ -753,7 +781,8 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce
ProcessDefinition processDefinition =
processDefineMapper.queryByCode(processInstance.getProcessDefinitionCode());
if (processDefinition != null && projectCode != processDefinition.getProjectCode()) {
- logger.error("Process definition does not exist, projectCode:{}, processDefinitionCode:{}.", projectCode, processInstance.getProcessDefinitionCode());
+ logger.error("Process definition does not exist, projectCode:{}, processDefinitionCode:{}.", projectCode,
+ processInstance.getProcessDefinitionCode());
putMsg(result, PROCESS_INSTANCE_NOT_EXIST, processInstanceId);
return result;
}
@@ -801,7 +830,8 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce
Map<String, String> timeParams) {
Map<String, Map<String, Object>> localUserDefParams = new HashMap<>();
List<TaskInstance> taskInstanceList =
- taskInstanceMapper.findValidTaskListByProcessId(processInstance.getId(), Flag.YES, processInstance.getTestFlag());
+ taskInstanceMapper.findValidTaskListByProcessId(processInstance.getId(), Flag.YES,
+ processInstance.getTestFlag());
for (TaskInstance taskInstance : taskInstanceList) {
TaskDefinitionLog taskDefinitionLog = taskDefinitionLogMapper.queryByDefinitionCodeAndVersion(
taskInstance.getTaskCode(), taskInstance.getTaskDefinitionVersion());
@@ -836,7 +866,8 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce
ProcessInstance processInstance = processInstanceMapper.queryDetailById(processInstanceId);
if (processInstance == null) {
- logger.error("Process instance does not exist, projectCode:{}, processInstanceId:{}.", projectCode, processInstanceId);
+ logger.error("Process instance does not exist, projectCode:{}, processInstanceId:{}.", projectCode,
+ processInstanceId);
putMsg(result, Status.PROCESS_INSTANCE_NOT_EXIST, processInstanceId);
return result;
}
@@ -845,7 +876,8 @@ public class ProcessInstanceServiceImpl extends BaseServiceImpl implements Proce
processInstance.getProcessDefinitionCode(),
processInstance.getProcessDefinitionVersion());
if (processDefinition == null || projectCode != processDefinition.getProjectCode()) {
- logger.error("Process definition does not exist, projectCode:{}, processDefinitionCode:{}.", projectCode, processInstance.getProcessDefinitionCode());
+ logger.error("Process definition does not exist, projectCode:{}, processDefinitionCode:{}.", projectCode,
+ processInstance.getProcessDefinitionCode());
putMsg(result, PROCESS_INSTANCE_NOT_EXIST, processInstanceId);
return result;
}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java
index bd43e549b4..401ec6abd2 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java
@@ -189,7 +189,7 @@ public class ProjectServiceImpl extends BaseServiceImpl implements ProjectServic
public Map<String, Object> queryByName(User loginUser, String projectName) {
Map<String, Object> result = new HashMap<>();
Project project = projectMapper.queryByName(projectName);
- boolean hasProjectAndPerm = hasProjectAndPerm(loginUser, project, result,PROJECT);
+ boolean hasProjectAndPerm = hasProjectAndPerm(loginUser, project, result, PROJECT);
if (!hasProjectAndPerm) {
return result;
}
@@ -218,7 +218,8 @@ public class ProjectServiceImpl extends BaseServiceImpl implements ProjectServic
} else if (!canOperatorPermissions(loginUser, new Object[]{project.getId()}, AuthorizationType.PROJECTS,
permission)) {
// check read permission
- logger.error("User does not have {} permission to operate project, userName:{}, projectCode:{}.", permission, loginUser.getUserName(), projectCode);
+ logger.error("User does not have {} permission to operate project, userName:{}, projectCode:{}.",
+ permission, loginUser.getUserName(), projectCode);
putMsg(result, Status.USER_NO_OPERATION_PROJECT_PERM, loginUser.getUserName(), projectCode);
} else {
putMsg(result, Status.SUCCESS);
@@ -244,9 +245,10 @@ public class ProjectServiceImpl extends BaseServiceImpl implements ProjectServic
if (project == null) {
logger.error("Project does not exist.");
putMsg(result, Status.PROJECT_NOT_FOUND, "");
- } else if (!canOperatorPermissions(loginUser, new Object[] {project.getId()}, AuthorizationType.PROJECTS,
+ } else if (!canOperatorPermissions(loginUser, new Object[]{project.getId()}, AuthorizationType.PROJECTS,
permission)) {
- logger.error("User does not have {} permission to operate project, userName:{}, projectCode:{}.", permission, loginUser.getUserName(), project.getCode());
+ logger.error("User does not have {} permission to operate project, userName:{}, projectCode:{}.",
+ permission, loginUser.getUserName(), project.getCode());
putMsg(result, Status.USER_NO_OPERATION_PROJECT_PERM, loginUser.getUserName(), project.getCode());
} else {
checkResult = true;
@@ -260,9 +262,10 @@ public class ProjectServiceImpl extends BaseServiceImpl implements ProjectServic
if (project == null) {
logger.error("Project does not exist.");
putMsg(result, Status.PROJECT_NOT_FOUND, "");
- } else if (!canOperatorPermissions(loginUser, new Object[] {project.getId()}, AuthorizationType.PROJECTS,
+ } else if (!canOperatorPermissions(loginUser, new Object[]{project.getId()}, AuthorizationType.PROJECTS,
permission)) {
- logger.error("User does not have {} permission to operate project, userName:{}, projectCode:{}.", permission, loginUser.getUserName(), project.getCode());
+ logger.error("User does not have {} permission to operate project, userName:{}, projectCode:{}.",
+ permission, loginUser.getUserName(), project.getCode());
putMsg(result, Status.USER_NO_OPERATION_PROJECT_PERM, loginUser.getUserName(), project.getName());
} else {
checkResult = true;
@@ -353,8 +356,9 @@ public class ProjectServiceImpl extends BaseServiceImpl implements ProjectServic
* @param project project
* @return check result
*/
- private Map<String, Object> getCheckResult(User loginUser, Project project,String perm) {
- Map<String, Object> checkResult = checkProjectAndAuth(loginUser, project, project == null ? 0L : project.getCode(),perm);
+ private Map<String, Object> getCheckResult(User loginUser, Project project, String perm) {
+ Map<String, Object> checkResult =
+ checkProjectAndAuth(loginUser, project, project == null ? 0L : project.getCode(), perm);
Status status = (Status) checkResult.get(Constants.STATUS);
if (status != Status.SUCCESS) {
return checkResult;
@@ -413,7 +417,6 @@ public class ProjectServiceImpl extends BaseServiceImpl implements ProjectServic
return result;
}
-
/**
* query unauthorized project
*
@@ -425,13 +428,16 @@ public class ProjectServiceImpl extends BaseServiceImpl implements ProjectServic
public Result queryUnauthorizedProject(User loginUser, Integer userId) {
Result result = new Result();
- Set<Integer> projectIds = resourcePermissionCheckService.userOwnedResourceIdsAcquisition(AuthorizationType.PROJECTS, loginUser.getId(), logger);
+ Set<Integer> projectIds = resourcePermissionCheckService
+ .userOwnedResourceIdsAcquisition(AuthorizationType.PROJECTS, loginUser.getId(), logger);
if (projectIds.isEmpty()) {
result.setData(Collections.emptyList());
putMsg(result, Status.SUCCESS);
return result;
}
- List<Project> projectList = projectMapper.listAuthorizedProjects(loginUser.getUserType().equals(UserType.ADMIN_USER) ? 0 : loginUser.getId(), new ArrayList<>(projectIds));
+ List<Project> projectList = projectMapper.listAuthorizedProjects(
+ loginUser.getUserType().equals(UserType.ADMIN_USER) ? 0 : loginUser.getId(),
+ new ArrayList<>(projectIds));
List<Project> resultList = new ArrayList<>();
Set<Project> projectSet;
@@ -535,7 +541,8 @@ public class ProjectServiceImpl extends BaseServiceImpl implements ProjectServic
public Result queryProjectCreatedAndAuthorizedByUser(User loginUser) {
Result result = new Result();
- Set<Integer> projectIds = resourcePermissionCheckService.userOwnedResourceIdsAcquisition(AuthorizationType.PROJECTS, loginUser.getId(), logger);
+ Set<Integer> projectIds = resourcePermissionCheckService
+ .userOwnedResourceIdsAcquisition(AuthorizationType.PROJECTS, loginUser.getId(), logger);
if (projectIds.isEmpty()) {
result.setData(Collections.emptyList());
putMsg(result, Status.SUCCESS);
@@ -595,7 +602,8 @@ public class ProjectServiceImpl extends BaseServiceImpl implements ProjectServic
@Override
public Result queryAllProjectList(User user) {
Result result = new Result();
- List<Project> projects = projectMapper.queryAllProject(user.getUserType() == UserType.ADMIN_USER ? 0 : user.getId());
+ List<Project> projects =
+ projectMapper.queryAllProject(user.getUserType() == UserType.ADMIN_USER ? 0 : user.getId());
result.setData(projects);
putMsg(result, Status.SUCCESS);
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/QueueServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/QueueServiceImpl.java
index 0bb8bd4284..bfba4d08d7 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/QueueServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/QueueServiceImpl.java
@@ -37,10 +37,8 @@ import org.apache.commons.lang3.StringUtils;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.HashMap;
import java.util.HashSet;
import java.util.List;
-import java.util.Map;
import java.util.Objects;
import java.util.Set;
@@ -91,7 +89,8 @@ public class QueueServiceImpl extends BaseServiceImpl implements QueueService {
* @param updateQueue The queue object want to update
*/
private void updateQueueValid(Queue existsQueue, Queue updateQueue) throws ServiceException {
- // Check the exists queue and the necessary of update operation, in not exist checker have to use updateQueue to avoid NPE
+ // Check the exists queue and the necessary of update operation, in not exist checker have to use updateQueue to
+ // avoid NPE
if (Objects.isNull(existsQueue)) {
throw new ServiceException(Status.QUEUE_NOT_EXIST, updateQueue.getQueue());
} else if (Objects.equals(existsQueue, updateQueue)) {
@@ -102,9 +101,11 @@ public class QueueServiceImpl extends BaseServiceImpl implements QueueService {
throw new ServiceException(Status.REQUEST_PARAMS_NOT_VALID_ERROR, Constants.QUEUE);
} else if (StringUtils.isEmpty(updateQueue.getQueueName())) {
throw new ServiceException(Status.REQUEST_PARAMS_NOT_VALID_ERROR, Constants.QUEUE_NAME);
- } else if (!Objects.equals(updateQueue.getQueue(), existsQueue.getQueue()) && checkQueueExist(updateQueue.getQueue())) {
+ } else if (!Objects.equals(updateQueue.getQueue(), existsQueue.getQueue())
+ && checkQueueExist(updateQueue.getQueue())) {
throw new ServiceException(Status.QUEUE_VALUE_EXIST, updateQueue.getQueue());
- } else if (!Objects.equals(updateQueue.getQueueName(), existsQueue.getQueueName()) && checkQueueNameExist(updateQueue.getQueueName())) {
+ } else if (!Objects.equals(updateQueue.getQueueName(), existsQueue.getQueueName())
+ && checkQueueNameExist(updateQueue.getQueueName())) {
throw new ServiceException(Status.QUEUE_NAME_EXIST, updateQueue.getQueueName());
}
}
@@ -118,7 +119,8 @@ public class QueueServiceImpl extends BaseServiceImpl implements QueueService {
@Override
public Result queryList(User loginUser) {
Result result = new Result();
- Set<Integer> ids = resourcePermissionCheckService.userOwnedResourceIdsAcquisition(AuthorizationType.QUEUE, loginUser.getId(), logger);
+ Set<Integer> ids = resourcePermissionCheckService.userOwnedResourceIdsAcquisition(AuthorizationType.QUEUE,
+ loginUser.getId(), logger);
if (loginUser.getUserType().equals(UserType.GENERAL_USER)) {
ids = ids.isEmpty() ? new HashSet<>() : ids;
ids.add(Constants.DEFAULT_QUEUE_ID);
@@ -142,7 +144,8 @@ public class QueueServiceImpl extends BaseServiceImpl implements QueueService {
public Result queryList(User loginUser, String searchVal, Integer pageNo, Integer pageSize) {
Result result = new Result();
PageInfo<Queue> pageInfo = new PageInfo<>(pageNo, pageSize);
- Set<Integer> ids = resourcePermissionCheckService.userOwnedResourceIdsAcquisition(AuthorizationType.QUEUE, loginUser.getId(), logger);
+ Set<Integer> ids = resourcePermissionCheckService.userOwnedResourceIdsAcquisition(AuthorizationType.QUEUE,
+ loginUser.getId(), logger);
if (ids.isEmpty()) {
result.setData(pageInfo);
putMsg(result, Status.SUCCESS);
@@ -171,7 +174,7 @@ public class QueueServiceImpl extends BaseServiceImpl implements QueueService {
@Transactional
public Result createQueue(User loginUser, String queue, String queueName) {
Result result = new Result();
- if (!canOperatorPermissions(loginUser,null, AuthorizationType.QUEUE,YARN_QUEUE_CREATE)) {
+ if (!canOperatorPermissions(loginUser, null, AuthorizationType.QUEUE, YARN_QUEUE_CREATE)) {
throw new ServiceException(Status.USER_NO_OPERATION_PERM);
}
@@ -182,7 +185,8 @@ public class QueueServiceImpl extends BaseServiceImpl implements QueueService {
result.setData(queueObj);
logger.info("Queue create complete, queueName:{}.", queueObj.getQueueName());
putMsg(result, Status.SUCCESS);
- permissionPostHandle(AuthorizationType.QUEUE, loginUser.getId(), Collections.singletonList(queueObj.getId()), logger);
+ permissionPostHandle(AuthorizationType.QUEUE, loginUser.getId(), Collections.singletonList(queueObj.getId()),
+ logger);
return result;
}
@@ -198,7 +202,7 @@ public class QueueServiceImpl extends BaseServiceImpl implements QueueService {
@Override
public Result updateQueue(User loginUser, int id, String queue, String queueName) {
Result result = new Result();
- if (!canOperatorPermissions(loginUser,new Object[]{id}, AuthorizationType.QUEUE,YARN_QUEUE_UPDATE)) {
+ if (!canOperatorPermissions(loginUser, new Object[]{id}, AuthorizationType.QUEUE, YARN_QUEUE_UPDATE)) {
throw new ServiceException(Status.USER_NO_OPERATION_PERM);
}
@@ -208,8 +212,9 @@ public class QueueServiceImpl extends BaseServiceImpl implements QueueService {
// check old queue using by any user
if (checkIfQueueIsInUsing(existsQueue.getQueueName(), updateQueue.getQueueName())) {
- //update user related old queue
- Integer relatedUserNums = userMapper.updateUserQueue(existsQueue.getQueueName(), updateQueue.getQueueName());
+ // update user related old queue
+ Integer relatedUserNums =
+ userMapper.updateUserQueue(existsQueue.getQueueName(), updateQueue.getQueueName());
logger.info("Old queue have related {} users, exec update user success.", relatedUserNums);
}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
index abb8135ad4..55e7eaaab1 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
@@ -279,7 +279,8 @@ public class ResourcesServiceImpl extends BaseServiceImpl implements ResourcesSe
return result;
}
if (fullName.length() > Constants.RESOURCE_FULL_NAME_MAX_LENGTH) {
- logger.warn("Resource file's name is longer than max full name length, fullName:{}, fullNameSize:{}, maxFullNameSize:{}",
+ logger.warn(
+ "Resource file's name is longer than max full name length, fullName:{}, fullNameSize:{}, maxFullNameSize:{}",
RegexUtils.escapeNRT(name), fullName.length(), Constants.RESOURCE_FULL_NAME_MAX_LENGTH);
putMsg(result, Status.RESOURCE_FULL_NAME_TOO_LONG_ERROR);
return result;
@@ -311,7 +312,8 @@ public class ResourcesServiceImpl extends BaseServiceImpl implements ResourcesSe
logger.error("Upload resource file failed, resourceName:{}, fileName:{}.",
RegexUtils.escapeNRT(name), RegexUtils.escapeNRT(file.getOriginalFilename()));
putMsg(result, Status.STORE_OPERATE_CREATE_ERROR);
- throw new ServiceException(String.format("upload resource: %s file: %s failed.", name, file.getOriginalFilename()));
+ throw new ServiceException(
+ String.format("upload resource: %s file: %s failed.", name, file.getOriginalFilename()));
} else
logger.info("Upload resource file complete, resourceName:{}, fileName:{}.",
RegexUtils.escapeNRT(name), RegexUtils.escapeNRT(file.getOriginalFilename()));
@@ -340,7 +342,8 @@ public class ResourcesServiceImpl extends BaseServiceImpl implements ResourcesSe
parentResource.setSize(0L);
}
resourcesMapper.updateById(parentResource);
- logger.info("Resource size update complete, resourceFullName:{}, newSize:{}.", parentResource.getFullName(), parentResource.getSize());
+ logger.info("Resource size update complete, resourceFullName:{}, newSize:{}.",
+ parentResource.getFullName(), parentResource.getSize());
}
}
}
@@ -405,7 +408,8 @@ public class ResourcesServiceImpl extends BaseServiceImpl implements ResourcesSe
}
if (!PropertyUtils.getResUploadStartupState()) {
- logger.error("Storage does not start up, resource upload startup state: {}.", PropertyUtils.getResUploadStartupState());
+ logger.error("Storage does not start up, resource upload startup state: {}.",
+ PropertyUtils.getResUploadStartupState());
putMsg(result, Status.STORAGE_NOT_STARTUP);
return result;
}
@@ -452,7 +456,8 @@ public class ResourcesServiceImpl extends BaseServiceImpl implements ResourcesSe
String originFileName = storageOperate.getFileName(resource.getType(), tenantCode, originFullName);
try {
if (!storageOperate.exists(tenantCode, originFileName)) {
- logger.error("Resource file does not exist in {} storage, tenantCode:{}, resourceId:{}, originFileName:{}.",
+ logger.error(
+ "Resource file does not exist in {} storage, tenantCode:{}, resourceId:{}, originFileName:{}.",
resource.getType(), tenantCode, resourceId, originFileName);
putMsg(result, Status.RESOURCE_NOT_EXIST);
return result;
@@ -613,7 +618,8 @@ public class ResourcesServiceImpl extends BaseServiceImpl implements ResourcesSe
}
if (file != null && FileUtils.directoryTraversal(Objects.requireNonNull(file.getOriginalFilename()))) {
- logger.warn("File original name verify failed, fileOriginalName:{}.", RegexUtils.escapeNRT(file.getOriginalFilename()));
+ logger.warn("File original name verify failed, fileOriginalName:{}.",
+ RegexUtils.escapeNRT(file.getOriginalFilename()));
putMsg(result, Status.VERIFY_PARAMETER_NAME_FAILED);
return result;
}
@@ -621,7 +627,8 @@ public class ResourcesServiceImpl extends BaseServiceImpl implements ResourcesSe
if (file != null) {
// file is empty
if (file.isEmpty()) {
- logger.warn("Parameter file is empty, fileOriginalName:{}.", RegexUtils.escapeNRT(file.getOriginalFilename()));
+ logger.warn("Parameter file is empty, fileOriginalName:{}.",
+ RegexUtils.escapeNRT(file.getOriginalFilename()));
putMsg(result, Status.RESOURCE_FILE_IS_EMPTY);
return result;
}
@@ -646,7 +653,8 @@ public class ResourcesServiceImpl extends BaseServiceImpl implements ResourcesSe
return result;
}
if (file.getSize() > Constants.MAX_FILE_SIZE) {
- logger.warn("Resource file size is larger than max file size, fileOriginalName:{}, fileSize:{}, maxFileSize:{}.",
+ logger.warn(
+ "Resource file size is larger than max file size, fileOriginalName:{}, fileSize:{}, maxFileSize:{}.",
RegexUtils.escapeNRT(file.getOriginalFilename()), file.getSize(), Constants.MAX_FILE_SIZE);
putMsg(result, Status.RESOURCE_SIZE_EXCEED_LIMIT);
return result;
@@ -876,7 +884,8 @@ public class ResourcesServiceImpl extends BaseServiceImpl implements ResourcesSe
Integer[] needDeleteResourceIdArray = allChildren.toArray(new Integer[allChildren.size()]);
if (needDeleteResourceIdArray.length >= 2) {
- logger.warn("Resource can not be deleted because there are files or folders {} in the current directory.", resource.getFileName());
+ logger.warn("Resource can not be deleted because there are files or folders {} in the current directory.",
+ resource.getFileName());
putMsg(result, Status.RESOURCE_HAS_FOLDER, resource.getFileName());
return result;
}
@@ -886,14 +895,16 @@ public class ResourcesServiceImpl extends BaseServiceImpl implements ResourcesSe
List<UdfFunc> udfFuncs = udfFunctionMapper.listUdfByResourceId(needDeleteResourceIdArray);
List<Integer> udfFuncIds = udfFuncs.stream().map(UdfFunc::getId).collect(Collectors.toList());
if (CollectionUtils.isNotEmpty(udfFuncs)) {
- logger.warn("Resource can not be deleted because it is bound by UDF functions, udfFuncIds:{}", udfFuncIds);
+ logger.warn("Resource can not be deleted because it is bound by UDF functions, udfFuncIds:{}",
+ udfFuncIds);
putMsg(result, Status.UDF_RESOURCE_IS_BOUND, udfFuncs.get(0).getFuncName());
return result;
}
}
if (resourceIdSet.contains(resource.getPid())) {
- logger.warn("Resource can not be deleted because it is used by process definition, resourceId:{}, processDefinitionCode:{}.",
+ logger.warn(
+ "Resource can not be deleted because it is used by process definition, resourceId:{}, processDefinitionCode:{}.",
resource.getId(), resource.getPid());
putMsg(result, Status.RESOURCE_IS_USED);
return result;
@@ -901,7 +912,8 @@ public class ResourcesServiceImpl extends BaseServiceImpl implements ResourcesSe
resourceIdSet.retainAll(allChildren);
if (CollectionUtils.isNotEmpty(resourceIdSet)) {
for (Integer resId : resourceIdSet) {
- logger.warn("Resource can not be deleted because it is used by process definition, resourceId:{}, processDefinitionCode:{}.",
+ logger.warn(
+ "Resource can not be deleted because it is used by process definition, resourceId:{}, processDefinitionCode:{}.",
resId, resourceProcessMap.get(resId));
}
putMsg(result, Status.RESOURCE_IS_USED);
@@ -959,7 +971,8 @@ public class ResourcesServiceImpl extends BaseServiceImpl implements ResourcesSe
try {
String filename = storageOperate.getFileName(type, tenantCode, fullName);
if (storageOperate.exists(tenantCode, filename)) {
- logger.warn("Resource file with same name exists so can not create again, tenantCode:{}, resourceName:{}.",
+ logger.warn(
+ "Resource file with same name exists so can not create again, tenantCode:{}, resourceName:{}.",
tenantCode, RegexUtils.escapeNRT(filename));
putMsg(result, Status.RESOURCE_FILE_EXIST, filename);
}
@@ -969,7 +982,9 @@ public class ResourcesServiceImpl extends BaseServiceImpl implements ResourcesSe
putMsg(result, Status.STORE_OPERATE_CREATE_ERROR);
}
} else {
- logger.error("Tenant does not exist or tenant of current login user does not specified, loginUserName:{}.", loginUser.getUserName());
+ logger.error(
+ "Tenant does not exist or tenant of current login user does not specified, loginUserName:{}.",
+ loginUser.getUserName());
putMsg(result, Status.CURRENT_LOGIN_USER_TENANT_NOT_EXIST);
}
}
@@ -1114,7 +1129,8 @@ public class ResourcesServiceImpl extends BaseServiceImpl implements ResourcesSe
if (storageOperate.exists(tenantCode, resourceFileName)) {
List<String> content = storageOperate.vimFile(tenantCode, resourceFileName, skipLineNum, limit);
- logger.info("Vim file content in path {} success, tenantCode:{}, fileName:{}, skipLineNum:{}, limit:{}.",
+ logger.info(
+ "Vim file content in path {} success, tenantCode:{}, fileName:{}, skipLineNum:{}, limit:{}.",
resourceFileName, tenantCode, resourceFileName, skipLineNum, limit);
putMsg(result, Status.SUCCESS);
Map<String, Object> map = new HashMap<>();
@@ -1325,7 +1341,8 @@ public class ResourcesServiceImpl extends BaseServiceImpl implements ResourcesSe
putMsg(result, Status.SUCCESS);
// if resource upload startup
if (!PropertyUtils.getResUploadStartupState()) {
- logger.error("Storage does not start up, resource upload startup state: {}.", PropertyUtils.getResUploadStartupState());
+ logger.error("Storage does not start up, resource upload startup state: {}.",
+ PropertyUtils.getResUploadStartupState());
putMsg(result, Status.STORAGE_NOT_STARTUP);
return result;
}
@@ -1437,7 +1454,8 @@ public class ResourcesServiceImpl extends BaseServiceImpl implements ResourcesSe
if (!FileUtils.writeContent2File(content, localFilename)) {
// write file fail
- logger.error("Write file error, fileName:{}, content:{}.", localFilename, RegexUtils.escapeNRT(content));
+ logger.error("Write file error, fileName:{}, content:{}.", localFilename,
+ RegexUtils.escapeNRT(content));
putMsg(result, Status.RESOURCE_NOT_EXIST);
return result;
}
@@ -1450,7 +1468,8 @@ public class ResourcesServiceImpl extends BaseServiceImpl implements ResourcesSe
if (!storageOperate.exists(tenantCode, resourcePath)) {
// create if tenant dir not exists
storageOperate.createTenantDirIfNotExists(tenantCode);
- logger.info("Create tenant dir because path {} does not exist, tenantCode:{}.", resourcePath, tenantCode);
+ logger.info("Create tenant dir because path {} does not exist, tenantCode:{}.", resourcePath,
+ tenantCode);
}
if (storageOperate.exists(tenantCode, storageFileName)) {
storageOperate.delete(tenantCode, storageFileName, false);
@@ -1458,7 +1477,8 @@ public class ResourcesServiceImpl extends BaseServiceImpl implements ResourcesSe
storageOperate.upload(tenantCode, localFilename, storageFileName, true, true);
} catch (Exception e) {
- logger.error("Upload content to storage error, tenantCode:{}, destFileName:{}.", tenantCode, storageFileName, e);
+ logger.error("Upload content to storage error, tenantCode:{}, destFileName:{}.", tenantCode,
+ storageFileName, e);
result.setCode(Status.HDFS_OPERATION_ERROR.getCode());
result.setMsg(String.format("copy %s to hdfs %s fail", localFilename, storageFileName));
return result;
@@ -1479,7 +1499,8 @@ public class ResourcesServiceImpl extends BaseServiceImpl implements ResourcesSe
public org.springframework.core.io.Resource downloadResource(User loginUser, int resourceId) throws IOException {
// if resource upload startup
if (!PropertyUtils.getResUploadStartupState()) {
- logger.warn("Storage does not start up, resource upload startup state: {}.", PropertyUtils.getResUploadStartupState());
+ logger.warn("Storage does not start up, resource upload startup state: {}.",
+ PropertyUtils.getResUploadStartupState());
throw new ServiceException("hdfs not startup");
}
@@ -1514,7 +1535,8 @@ public class ResourcesServiceImpl extends BaseServiceImpl implements ResourcesSe
Tenant tenant = tenantMapper.queryById(user.getTenantId());
if (tenant == null) {
logger.error("Tenant does not exists, tenantId:{}.", user.getTenantId());
- throw new ServiceException(String.format("The tenant id %d of resource owner does not exist", user.getTenantId()));
+ throw new ServiceException(
+ String.format("The tenant id %d of resource owner does not exist", user.getTenantId()));
}
String tenantCode = tenant.getTenantCode();
@@ -1526,7 +1548,8 @@ public class ResourcesServiceImpl extends BaseServiceImpl implements ResourcesSe
try {
storageOperate.download(tenantCode, fileName, localFileName, false, true);
- org.springframework.core.io.Resource file2Resource = org.apache.dolphinscheduler.api.utils.FileUtils.file2Resource(localFileName);
+ org.springframework.core.io.Resource file2Resource =
+ org.apache.dolphinscheduler.api.utils.FileUtils.file2Resource(localFileName);
if (file2Resource != null) {
logger.info("Download resource complete, path:{}, localFileName:{}.", fileName, localFileName);
}
@@ -1578,7 +1601,8 @@ public class ResourcesServiceImpl extends BaseServiceImpl implements ResourcesSe
User user = userMapper.queryByUserNameAccurately(userName);
Result<Object> resourceResponse = this.queryResource(user, fullName, null, ResourceType.FILE);
if (resourceResponse.getCode() != Status.SUCCESS.getCode()) {
- String msg = String.format("Query resource by fullName failed, userName:%s, fullName:%s", userName, fullName);
+ String msg =
+ String.format("Query resource by fullName failed, userName:%s, fullName:%s", userName, fullName);
logger.error(msg);
throw new IllegalArgumentException(msg);
}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/SessionServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/SessionServiceImpl.java
index 6734a21990..c8439ca6b2 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/SessionServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/SessionServiceImpl.java
@@ -153,7 +153,7 @@ public class SessionServiceImpl extends BaseServiceImpl implements SessionServic
*/
Session session = sessionMapper.queryByUserIdAndIp(loginUser.getId(), ip);
- //delete session
+ // delete session
sessionMapper.deleteById(session.getId());
} catch (Exception e) {
logger.warn("userId : {} , ip : {} , find more one session", loginUser.getId(), ip, e);
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskGroupQueueServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskGroupQueueServiceImpl.java
index c9c1eba5af..c96996e3bc 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskGroupQueueServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskGroupQueueServiceImpl.java
@@ -65,20 +65,21 @@ public class TaskGroupQueueServiceImpl extends BaseServiceImpl implements TaskGr
* @return tasks list
*/
@Override
- public Map<String, Object> queryTasksByGroupId(User loginUser, String taskName
- , String processName, Integer status, int groupId, int pageNo, int pageSize) {
+ public Map<String, Object> queryTasksByGroupId(User loginUser, String taskName, String processName, Integer status,
+ int groupId, int pageNo, int pageSize) {
Map<String, Object> result = new HashMap<>();
Page<TaskGroupQueue> page = new Page<>(pageNo, pageSize);
PageInfo<TaskGroupQueue> pageInfo = new PageInfo<>(pageNo, pageSize);
- Set<Integer> projectIds = resourcePermissionCheckService.userOwnedResourceIdsAcquisition(AuthorizationType.PROJECTS, loginUser.getId(), logger);
+ Set<Integer> projectIds = resourcePermissionCheckService
+ .userOwnedResourceIdsAcquisition(AuthorizationType.PROJECTS, loginUser.getId(), logger);
if (projectIds.isEmpty()) {
result.put(Constants.DATA_LIST, pageInfo);
putMsg(result, Status.SUCCESS);
return result;
}
List<Project> projects = projectMapper.selectBatchIds(projectIds);
- IPage<TaskGroupQueue> taskGroupQueue = taskGroupQueueMapper.queryTaskGroupQueueByTaskGroupIdPaging(page, taskName
- ,processName,status,groupId,projects);
+ IPage<TaskGroupQueue> taskGroupQueue = taskGroupQueueMapper.queryTaskGroupQueueByTaskGroupIdPaging(page,
+ taskName, processName, status, groupId, projects);
pageInfo.setTotal((int) taskGroupQueue.getTotal());
pageInfo.setTotalList(taskGroupQueue.getRecords());
@@ -99,7 +100,7 @@ public class TaskGroupQueueServiceImpl extends BaseServiceImpl implements TaskGr
*/
@Override
public Map<String, Object> queryTasksByProcessId(User loginUser, int pageNo, int pageSize, int processId) {
- return this.doQuery(loginUser, pageNo, pageSize, processId);
+ return this.doQuery(loginUser, pageNo, pageSize, processId);
}
/**
@@ -112,7 +113,7 @@ public class TaskGroupQueueServiceImpl extends BaseServiceImpl implements TaskGr
*/
@Override
public Map<String, Object> queryAllTasks(User loginUser, int pageNo, int pageSize) {
- return this.doQuery(loginUser, pageNo, pageSize, 0);
+ return this.doQuery(loginUser, pageNo, pageSize, 0);
}
public Map<String, Object> doQuery(User loginUser, int pageNo, int pageSize,
@@ -145,12 +146,12 @@ public class TaskGroupQueueServiceImpl extends BaseServiceImpl implements TaskGr
}
@Override
- public void forceStartTask(int queueId,int forceStart) {
- taskGroupQueueMapper.updateForceStart(queueId,forceStart);
+ public void forceStartTask(int queueId, int forceStart) {
+ taskGroupQueueMapper.updateForceStart(queueId, forceStart);
}
@Override
public void modifyPriority(Integer queueId, Integer priority) {
- taskGroupQueueMapper.modifyPriority(queueId,priority);
+ taskGroupQueueMapper.modifyPriority(queueId, priority);
}
}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskGroupServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskGroupServiceImpl.java
index d954b94413..6f22af8662 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskGroupServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskGroupServiceImpl.java
@@ -117,7 +117,8 @@ public class TaskGroupServiceImpl extends BaseServiceImpl implements TaskGroupSe
taskGroup.setCreateTime(new Date());
taskGroup.setUpdateTime(new Date());
if (taskGroupMapper.insert(taskGroup) > 0) {
- permissionPostHandle(AuthorizationType.TASK_GROUP, loginUser.getId(), Collections.singletonList(taskGroup.getId()),logger);
+ permissionPostHandle(AuthorizationType.TASK_GROUP, loginUser.getId(),
+ Collections.singletonList(taskGroup.getId()), logger);
logger.info("Create task group complete, taskGroupName:{}.", taskGroup.getName());
putMsg(result, Status.SUCCESS);
} else {
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskInstanceServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskInstanceServiceImpl.java
index 1aabfd44c7..7c6b724c90 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskInstanceServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskInstanceServiceImpl.java
@@ -38,11 +38,11 @@ import org.apache.dolphinscheduler.dao.entity.User;
import org.apache.dolphinscheduler.dao.mapper.ProjectMapper;
import org.apache.dolphinscheduler.dao.mapper.TaskDefinitionMapper;
import org.apache.dolphinscheduler.dao.mapper.TaskInstanceMapper;
+import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus;
import org.apache.dolphinscheduler.remote.command.TaskKillRequestCommand;
import org.apache.dolphinscheduler.remote.command.TaskSavePointRequestCommand;
import org.apache.dolphinscheduler.remote.processor.StateEventCallbackService;
import org.apache.dolphinscheduler.remote.utils.Host;
-import org.apache.dolphinscheduler.plugin.task.api.enums.TaskExecutionStatus;
import org.apache.dolphinscheduler.service.process.ProcessService;
import java.util.Date;
@@ -154,12 +154,12 @@ public class TaskInstanceServiceImpl extends BaseServiceImpl implements TaskInst
if (taskExecuteType == TaskExecuteType.STREAM) {
// stream task without process instance
taskInstanceIPage = taskInstanceMapper.queryStreamTaskInstanceListPaging(
- page, project.getCode(), processDefinitionName, searchVal, taskName, executorId, statusArray, host, taskExecuteType, start, end
- );
+ page, project.getCode(), processDefinitionName, searchVal, taskName, executorId, statusArray, host,
+ taskExecuteType, start, end);
} else {
taskInstanceIPage = taskInstanceMapper.queryTaskInstanceListPaging(
- page, project.getCode(), processInstanceId, processInstanceName, searchVal, taskName, executorId, statusArray, host, taskExecuteType, start, end
- );
+ page, project.getCode(), processInstanceId, processInstanceName, searchVal, taskName, executorId,
+ statusArray, host, taskExecuteType, start, end);
}
Set<String> exclusionSet = new HashSet<>();
exclusionSet.add(Constants.CLASS);
@@ -205,21 +205,24 @@ public class TaskInstanceServiceImpl extends BaseServiceImpl implements TaskInst
// check whether the task instance can be found
TaskInstance task = taskInstanceMapper.selectById(taskInstanceId);
if (task == null) {
- logger.error("Task instance can not be found, projectCode:{}, taskInstanceId:{}.", projectCode, taskInstanceId);
+ logger.error("Task instance can not be found, projectCode:{}, taskInstanceId:{}.", projectCode,
+ taskInstanceId);
putMsg(result, Status.TASK_INSTANCE_NOT_FOUND);
return result;
}
TaskDefinition taskDefinition = taskDefinitionMapper.queryByCode(task.getTaskCode());
if (taskDefinition != null && projectCode != taskDefinition.getProjectCode()) {
- logger.error("Task definition can not be found, projectCode:{}, taskDefinitionCode:{}.", projectCode, task.getTaskCode());
+ logger.error("Task definition can not be found, projectCode:{}, taskDefinitionCode:{}.", projectCode,
+ task.getTaskCode());
putMsg(result, Status.TASK_INSTANCE_NOT_FOUND, taskInstanceId);
return result;
}
// check whether the task instance state type is failure or cancel
if (!task.getState().isFailure() && !task.getState().isKill()) {
- logger.warn("{} type task instance can not perform force success, projectCode:{}, taskInstanceId:{}.", task.getState().getDesc(), projectCode, taskInstanceId);
+ logger.warn("{} type task instance can not perform force success, projectCode:{}, taskInstanceId:{}.",
+ task.getState().getDesc(), projectCode, taskInstanceId);
putMsg(result, Status.TASK_INSTANCE_STATE_OPERATION_ERROR, taskInstanceId, task.getState().toString());
return result;
}
@@ -229,10 +232,12 @@ public class TaskInstanceServiceImpl extends BaseServiceImpl implements TaskInst
int changedNum = taskInstanceMapper.updateById(task);
if (changedNum > 0) {
processService.forceProcessInstanceSuccessByTaskInstanceId(taskInstanceId);
- logger.info("Task instance performs force success complete, projectCode:{}, taskInstanceId:{}", projectCode, taskInstanceId);
+ logger.info("Task instance performs force success complete, projectCode:{}, taskInstanceId:{}", projectCode,
+ taskInstanceId);
putMsg(result, Status.SUCCESS);
} else {
- logger.error("Task instance performs force success complete, projectCode:{}, taskInstanceId:{}", projectCode, taskInstanceId);
+ logger.error("Task instance performs force success complete, projectCode:{}, taskInstanceId:{}",
+ projectCode, taskInstanceId);
putMsg(result, Status.FORCE_TASK_SUCCESS_ERROR);
}
return result;
@@ -243,17 +248,19 @@ public class TaskInstanceServiceImpl extends BaseServiceImpl implements TaskInst
Result result = new Result();
Project project = projectMapper.queryByCode(projectCode);
- //check user access for project
- Map<String, Object> checkResult = projectService.checkProjectAndAuth(loginUser, project, projectCode, FORCED_SUCCESS);
+ // check user access for project
+ Map<String, Object> checkResult =
+ projectService.checkProjectAndAuth(loginUser, project, projectCode, FORCED_SUCCESS);
Status status = (Status) checkResult.get(Constants.STATUS);
if (status != Status.SUCCESS) {
- putMsg(result,status);
+ putMsg(result, status);
return result;
}
TaskInstance taskInstance = taskInstanceMapper.selectById(taskInstanceId);
if (taskInstance == null) {
- logger.error("Task definition can not be found, projectCode:{}, taskInstanceId:{}.", projectCode, taskInstanceId);
+ logger.error("Task definition can not be found, projectCode:{}, taskInstanceId:{}.", projectCode,
+ taskInstanceId);
putMsg(result, Status.TASK_INSTANCE_NOT_FOUND);
return result;
}
@@ -272,17 +279,19 @@ public class TaskInstanceServiceImpl extends BaseServiceImpl implements TaskInst
Result result = new Result();
Project project = projectMapper.queryByCode(projectCode);
- //check user access for project
- Map<String, Object> checkResult = projectService.checkProjectAndAuth(loginUser, project, projectCode,FORCED_SUCCESS);
+ // check user access for project
+ Map<String, Object> checkResult =
+ projectService.checkProjectAndAuth(loginUser, project, projectCode, FORCED_SUCCESS);
Status status = (Status) checkResult.get(Constants.STATUS);
if (status != Status.SUCCESS) {
- putMsg(result,status);
+ putMsg(result, status);
return result;
}
TaskInstance taskInstance = taskInstanceMapper.selectById(taskInstanceId);
if (taskInstance == null) {
- logger.error("Task definition can not be found, projectCode:{}, taskInstanceId:{}.", projectCode, taskInstanceId);
+ logger.error("Task definition can not be found, projectCode:{}, taskInstanceId:{}.", projectCode,
+ taskInstanceId);
putMsg(result, Status.TASK_INSTANCE_NOT_FOUND);
return result;
}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TenantServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TenantServiceImpl.java
index 169b0a6348..682f70c296 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TenantServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TenantServiceImpl.java
@@ -17,10 +17,11 @@
package org.apache.dolphinscheduler.api.service.impl;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.lang3.StringUtils;
+import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.TENANT_CREATE;
+import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.TENANT_DELETE;
+import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.TENANT_UPDATE;
+import static org.apache.dolphinscheduler.common.Constants.TENANT_FULL_NAME_MAX_LENGTH;
+
import org.apache.dolphinscheduler.api.enums.Status;
import org.apache.dolphinscheduler.api.exceptions.ServiceException;
import org.apache.dolphinscheduler.api.service.QueueService;
@@ -41,23 +42,26 @@ import org.apache.dolphinscheduler.dao.mapper.ProcessInstanceMapper;
import org.apache.dolphinscheduler.dao.mapper.TenantMapper;
import org.apache.dolphinscheduler.dao.mapper.UserMapper;
import org.apache.dolphinscheduler.service.storage.StorageOperate;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+
+import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
import java.util.ArrayList;
import java.util.Collections;
-import java.util.Date;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
-import static org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant.*;
-import static org.apache.dolphinscheduler.common.Constants.TENANT_FULL_NAME_MAX_LENGTH;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
/**
* tenant service impl
@@ -121,7 +125,8 @@ public class TenantServiceImpl extends BaseServiceImpl implements TenantService
throw new ServiceException(Status.TENANT_FULL_NAME_TOO_LONG_ERROR);
} else if (!RegexUtils.isValidLinuxUserName(updateTenant.getTenantCode())) {
throw new ServiceException(Status.CHECK_OS_TENANT_CODE_ERROR);
- } else if (!Objects.equals(existsTenant.getTenantCode(), updateTenant.getTenantCode()) && checkTenantExists(updateTenant.getTenantCode())) {
+ } else if (!Objects.equals(existsTenant.getTenantCode(), updateTenant.getTenantCode())
+ && checkTenantExists(updateTenant.getTenantCode())) {
throw new ServiceException(Status.OS_TENANT_CODE_EXIST, updateTenant.getTenantCode());
}
}
@@ -144,10 +149,10 @@ public class TenantServiceImpl extends BaseServiceImpl implements TenantService
String desc) throws Exception {
Map<String, Object> result = new HashMap<>();
result.put(Constants.STATUS, false);
- if (!canOperatorPermissions(loginUser,null, AuthorizationType.TENANT, TENANT_CREATE)) {
+ if (!canOperatorPermissions(loginUser, null, AuthorizationType.TENANT, TENANT_CREATE)) {
throw new ServiceException(Status.USER_NO_OPERATION_PERM);
}
- if(checkDescriptionLength(desc)){
+ if (checkDescriptionLength(desc)) {
logger.warn("Parameter description is too long.");
putMsg(result, Status.DESCRIPTION_TOO_LONG_ERROR);
return result;
@@ -160,7 +165,8 @@ public class TenantServiceImpl extends BaseServiceImpl implements TenantService
if (PropertyUtils.getResUploadStartupState()) {
storageOperate.createTenantDirIfNotExists(tenantCode);
}
- permissionPostHandle(AuthorizationType.TENANT, loginUser.getId(), Collections.singletonList(tenant.getId()), logger);
+ permissionPostHandle(AuthorizationType.TENANT, loginUser.getId(), Collections.singletonList(tenant.getId()),
+ logger);
result.put(Constants.DATA_LIST, tenant);
putMsg(result, Status.SUCCESS);
return result;
@@ -180,7 +186,8 @@ public class TenantServiceImpl extends BaseServiceImpl implements TenantService
Result<Object> result = new Result<>();
PageInfo<Tenant> pageInfo = new PageInfo<>(pageNo, pageSize);
- Set<Integer> ids = resourcePermissionCheckService.userOwnedResourceIdsAcquisition(AuthorizationType.TENANT, loginUser.getId(), logger);
+ Set<Integer> ids = resourcePermissionCheckService.userOwnedResourceIdsAcquisition(AuthorizationType.TENANT,
+ loginUser.getId(), logger);
if (ids.isEmpty()) {
result.setData(pageInfo);
putMsg(result, Status.SUCCESS);
@@ -213,10 +220,10 @@ public class TenantServiceImpl extends BaseServiceImpl implements TenantService
Map<String, Object> result = new HashMap<>();
- if (!canOperatorPermissions(loginUser,null, AuthorizationType.TENANT,TENANT_UPDATE)) {
+ if (!canOperatorPermissions(loginUser, null, AuthorizationType.TENANT, TENANT_UPDATE)) {
throw new ServiceException(Status.USER_NO_OPERATION_PERM);
}
- if(checkDescriptionLength(desc)){
+ if (checkDescriptionLength(desc)) {
logger.warn("Parameter description is too long.");
putMsg(result, Status.DESCRIPTION_TOO_LONG_ERROR);
return result;
@@ -229,7 +236,8 @@ public class TenantServiceImpl extends BaseServiceImpl implements TenantService
/**
* if the tenant code is modified, the original resource needs to be copied to the new tenant.
*/
- if (!Objects.equals(existsTenant.getTenantCode(), updateTenant.getTenantCode()) && PropertyUtils.getResUploadStartupState()) {
+ if (!Objects.equals(existsTenant.getTenantCode(), updateTenant.getTenantCode())
+ && PropertyUtils.getResUploadStartupState()) {
storageOperate.createTenantDirIfNotExists(tenantCode);
}
int update = tenantMapper.updateById(updateTenant);
@@ -256,7 +264,7 @@ public class TenantServiceImpl extends BaseServiceImpl implements TenantService
public Map<String, Object> deleteTenantById(User loginUser, int id) throws Exception {
Map<String, Object> result = new HashMap<>();
- if (!canOperatorPermissions(loginUser,null, AuthorizationType.TENANT,TENANT_DELETE)) {
+ if (!canOperatorPermissions(loginUser, null, AuthorizationType.TENANT, TENANT_DELETE)) {
throw new ServiceException(Status.USER_NO_OPERATION_PERM);
}
@@ -268,14 +276,16 @@ public class TenantServiceImpl extends BaseServiceImpl implements TenantService
List<ProcessInstance> processInstances = getProcessInstancesByTenant(tenant);
if (CollectionUtils.isNotEmpty(processInstances)) {
- logger.warn("Delete tenant failed, because there are {} executing process instances using it.", processInstances.size());
+ logger.warn("Delete tenant failed, because there are {} executing process instances using it.",
+ processInstances.size());
throw new ServiceException(Status.DELETE_TENANT_BY_ID_FAIL, processInstances.size());
}
List<ProcessDefinition> processDefinitions =
processDefinitionMapper.queryDefinitionListByTenant(tenant.getId());
if (CollectionUtils.isNotEmpty(processDefinitions)) {
- logger.warn("Delete tenant failed, because there are {} process definitions using it.", processDefinitions.size());
+ logger.warn("Delete tenant failed, because there are {} process definitions using it.",
+ processDefinitions.size());
throw new ServiceException(Status.DELETE_TENANT_BY_ID_FAIL_DEFINES, processDefinitions.size());
}
@@ -287,7 +297,7 @@ public class TenantServiceImpl extends BaseServiceImpl implements TenantService
// if resource upload startup
if (PropertyUtils.getResUploadStartupState()) {
- storageOperate.deleteTenant(tenant.getTenantCode());
+ storageOperate.deleteTenant(tenant.getTenantCode());
}
int delete = tenantMapper.deleteById(id);
@@ -304,7 +314,8 @@ public class TenantServiceImpl extends BaseServiceImpl implements TenantService
}
private List<ProcessInstance> getProcessInstancesByTenant(Tenant tenant) {
- return processInstanceMapper.queryByTenantIdAndStatus(tenant.getId(), org.apache.dolphinscheduler.service.utils.Constants.NOT_TERMINATED_STATES);
+ return processInstanceMapper.queryByTenantIdAndStatus(tenant.getId(),
+ org.apache.dolphinscheduler.service.utils.Constants.NOT_TERMINATED_STATES);
}
/**
@@ -317,7 +328,8 @@ public class TenantServiceImpl extends BaseServiceImpl implements TenantService
public Map<String, Object> queryTenantList(User loginUser) {
Map<String, Object> result = new HashMap<>();
- Set<Integer> ids = resourcePermissionCheckService.userOwnedResourceIdsAcquisition(AuthorizationType.TENANT, loginUser.getId(), logger);
+ Set<Integer> ids = resourcePermissionCheckService.userOwnedResourceIdsAcquisition(AuthorizationType.TENANT,
+ loginUser.getId(), logger);
if (ids.isEmpty()) {
result.put(Constants.DATA_LIST, Collections.emptyList());
putMsg(result, Status.SUCCESS);
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/UdfFuncServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/UdfFuncServiceImpl.java
index 578668eea6..c5e5da007c 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/UdfFuncServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/UdfFuncServiceImpl.java
@@ -17,9 +17,6 @@
package org.apache.dolphinscheduler.api.service.impl;
-import com.baomidou.mybatisplus.core.metadata.IPage;
-import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
-import org.apache.commons.lang3.StringUtils;
import org.apache.dolphinscheduler.api.constants.ApiFuncIdentificationConstant;
import org.apache.dolphinscheduler.api.enums.Status;
import org.apache.dolphinscheduler.api.service.UdfFuncService;
@@ -34,11 +31,8 @@ import org.apache.dolphinscheduler.dao.entity.User;
import org.apache.dolphinscheduler.dao.mapper.ResourceMapper;
import org.apache.dolphinscheduler.dao.mapper.UDFUserMapper;
import org.apache.dolphinscheduler.dao.mapper.UdfFuncMapper;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.stereotype.Service;
-import org.springframework.transaction.annotation.Transactional;
+
+import org.apache.commons.lang3.StringUtils;
import java.util.ArrayList;
import java.util.Collections;
@@ -46,6 +40,15 @@ import java.util.Date;
import java.util.List;
import java.util.Set;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Service;
+import org.springframework.transaction.annotation.Transactional;
+
+import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+
/**
* udf func service impl
*/
@@ -88,19 +91,21 @@ public class UdfFuncServiceImpl extends BaseServiceImpl implements UdfFuncServic
int resourceId) {
Result<Object> result = new Result<>();
- boolean canOperatorPermissions = canOperatorPermissions(loginUser, null, AuthorizationType.UDF, ApiFuncIdentificationConstant.UDF_FUNCTION_CREATE);
- if (!canOperatorPermissions){
+ boolean canOperatorPermissions = canOperatorPermissions(loginUser, null, AuthorizationType.UDF,
+ ApiFuncIdentificationConstant.UDF_FUNCTION_CREATE);
+ if (!canOperatorPermissions) {
putMsg(result, Status.NO_CURRENT_OPERATING_PERMISSION);
return result;
}
- if(checkDescriptionLength(desc)){
+ if (checkDescriptionLength(desc)) {
logger.warn("Parameter description is too long.");
putMsg(result, Status.DESCRIPTION_TOO_LONG_ERROR);
return result;
}
// if resource upload startup
if (!PropertyUtils.getResUploadStartupState()) {
- logger.error("Storage does not start up, resource upload startup state: {}.", PropertyUtils.getResUploadStartupState());
+ logger.error("Storage does not start up, resource upload startup state: {}.",
+ PropertyUtils.getResUploadStartupState());
putMsg(result, Status.HDFS_NOT_STARTUP);
return result;
}
@@ -119,7 +124,7 @@ public class UdfFuncServiceImpl extends BaseServiceImpl implements UdfFuncServic
return result;
}
- //save data
+ // save data
UdfFunc udf = new UdfFunc();
Date now = new Date();
udf.setUserId(loginUser.getId());
@@ -165,8 +170,9 @@ public class UdfFuncServiceImpl extends BaseServiceImpl implements UdfFuncServic
@Override
public Result<Object> queryUdfFuncDetail(User loginUser, int id) {
Result<Object> result = new Result<>();
- boolean canOperatorPermissions = canOperatorPermissions(loginUser, new Object[]{id}, AuthorizationType.UDF, ApiFuncIdentificationConstant.UDF_FUNCTION_VIEW);
- if (!canOperatorPermissions){
+ boolean canOperatorPermissions = canOperatorPermissions(loginUser, new Object[]{id}, AuthorizationType.UDF,
+ ApiFuncIdentificationConstant.UDF_FUNCTION_VIEW);
+ if (!canOperatorPermissions) {
putMsg(result, Status.NO_CURRENT_OPERATING_PERMISSION);
return result;
}
@@ -206,12 +212,13 @@ public class UdfFuncServiceImpl extends BaseServiceImpl implements UdfFuncServic
int resourceId) {
Result<Object> result = new Result<>();
- boolean canOperatorPermissions = canOperatorPermissions(loginUser, new Object[]{udfFuncId}, AuthorizationType.UDF, ApiFuncIdentificationConstant.UDF_FUNCTION_UPDATE);
- if (!canOperatorPermissions){
+ boolean canOperatorPermissions = canOperatorPermissions(loginUser, new Object[]{udfFuncId},
+ AuthorizationType.UDF, ApiFuncIdentificationConstant.UDF_FUNCTION_UPDATE);
+ if (!canOperatorPermissions) {
putMsg(result, Status.NO_CURRENT_OPERATING_PERMISSION);
return result;
}
- if(checkDescriptionLength(desc)){
+ if (checkDescriptionLength(desc)) {
logger.warn("Parameter description is too long.");
putMsg(result, Status.DESCRIPTION_TOO_LONG_ERROR);
return result;
@@ -228,7 +235,8 @@ public class UdfFuncServiceImpl extends BaseServiceImpl implements UdfFuncServic
// if resource upload startup
if (!PropertyUtils.getResUploadStartupState()) {
- logger.error("Storage does not start up, resource upload startup state: {}.", PropertyUtils.getResUploadStartupState());
+ logger.error("Storage does not start up, resource upload startup state: {}.",
+ PropertyUtils.getResUploadStartupState());
putMsg(result, Status.HDFS_NOT_STARTUP);
return result;
}
@@ -282,14 +290,15 @@ public class UdfFuncServiceImpl extends BaseServiceImpl implements UdfFuncServic
@Override
public Result<Object> queryUdfFuncListPaging(User loginUser, String searchVal, Integer pageNo, Integer pageSize) {
Result<Object> result = new Result();
- boolean canOperatorPermissions = canOperatorPermissions(loginUser, null, AuthorizationType.UDF, ApiFuncIdentificationConstant.UDF_FUNCTION_VIEW);
- if (!canOperatorPermissions){
+ boolean canOperatorPermissions = canOperatorPermissions(loginUser, null, AuthorizationType.UDF,
+ ApiFuncIdentificationConstant.UDF_FUNCTION_VIEW);
+ if (!canOperatorPermissions) {
putMsg(result, Status.NO_CURRENT_OPERATING_PERMISSION);
return result;
}
PageInfo<UdfFunc> pageInfo = new PageInfo<>(pageNo, pageSize);
IPage<UdfFunc> udfFuncList = getUdfFuncsPage(loginUser, searchVal, pageSize, pageNo);
- pageInfo.setTotal((int)udfFuncList.getTotal());
+ pageInfo.setTotal((int) udfFuncList.getTotal());
pageInfo.setTotalList(udfFuncList.getRecords());
result.setData(pageInfo);
putMsg(result, Status.SUCCESS);
@@ -306,7 +315,8 @@ public class UdfFuncServiceImpl extends BaseServiceImpl implements UdfFuncServic
* @return udf function list page
*/
private IPage<UdfFunc> getUdfFuncsPage(User loginUser, String searchVal, Integer pageSize, int pageNo) {
- Set<Integer> udfFuncIds = resourcePermissionCheckService.userOwnedResourceIdsAcquisition(AuthorizationType.UDF, loginUser.getId(), logger);
+ Set<Integer> udfFuncIds = resourcePermissionCheckService.userOwnedResourceIdsAcquisition(AuthorizationType.UDF,
+ loginUser.getId(), logger);
Page<UdfFunc> page = new Page<>(pageNo, pageSize);
if (udfFuncIds.isEmpty()) {
return page;
@@ -325,13 +335,15 @@ public class UdfFuncServiceImpl extends BaseServiceImpl implements UdfFuncServic
public Result<Object> queryUdfFuncList(User loginUser, Integer type) {
Result<Object> result = new Result<>();
- boolean canOperatorPermissions = canOperatorPermissions(loginUser, null, AuthorizationType.UDF, ApiFuncIdentificationConstant.UDF_FUNCTION_VIEW);
- if (!canOperatorPermissions){
+ boolean canOperatorPermissions = canOperatorPermissions(loginUser, null, AuthorizationType.UDF,
+ ApiFuncIdentificationConstant.UDF_FUNCTION_VIEW);
+ if (!canOperatorPermissions) {
putMsg(result, Status.NO_CURRENT_OPERATING_PERMISSION);
return result;
}
- Set<Integer> udfFuncIds = resourcePermissionCheckService.userOwnedResourceIdsAcquisition(AuthorizationType.UDF, loginUser.getId(), logger);
- if (udfFuncIds.isEmpty()){
+ Set<Integer> udfFuncIds = resourcePermissionCheckService.userOwnedResourceIdsAcquisition(AuthorizationType.UDF,
+ loginUser.getId(), logger);
+ if (udfFuncIds.isEmpty()) {
result.setData(Collections.emptyList());
putMsg(result, Status.SUCCESS);
return result;
@@ -354,8 +366,9 @@ public class UdfFuncServiceImpl extends BaseServiceImpl implements UdfFuncServic
public Result<Object> delete(User loginUser, int id) {
Result<Object> result = new Result<>();
- boolean canOperatorPermissions = canOperatorPermissions(loginUser, new Object[]{id}, AuthorizationType.UDF, ApiFuncIdentificationConstant.UDF_FUNCTION_DELETE);
- if (!canOperatorPermissions){
+ boolean canOperatorPermissions = canOperatorPermissions(loginUser, new Object[]{id}, AuthorizationType.UDF,
+ ApiFuncIdentificationConstant.UDF_FUNCTION_DELETE);
+ if (!canOperatorPermissions) {
putMsg(result, Status.NO_CURRENT_OPERATING_PERMISSION);
return result;
}
@@ -375,8 +388,9 @@ public class UdfFuncServiceImpl extends BaseServiceImpl implements UdfFuncServic
@Override
public Result<Object> verifyUdfFuncByName(User loginUser, String name) {
Result<Object> result = new Result<>();
- boolean canOperatorPermissions = canOperatorPermissions(loginUser, null, AuthorizationType.UDF, ApiFuncIdentificationConstant.UDF_FUNCTION_VIEW);
- if (!canOperatorPermissions){
+ boolean canOperatorPermissions = canOperatorPermissions(loginUser, null, AuthorizationType.UDF,
+ ApiFuncIdentificationConstant.UDF_FUNCTION_VIEW);
+ if (!canOperatorPermissions) {
putMsg(result, Status.NO_CURRENT_OPERATING_PERMISSION);
return result;
}
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/UsersServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/UsersServiceImpl.java
index 7ed97daada..47d35bac72 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/UsersServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/UsersServiceImpl.java
@@ -56,6 +56,7 @@ import org.apache.dolphinscheduler.dao.mapper.UDFUserMapper;
import org.apache.dolphinscheduler.dao.mapper.UserMapper;
import org.apache.dolphinscheduler.dao.utils.ResourceProcessDefinitionUtils;
import org.apache.dolphinscheduler.service.storage.StorageOperate;
+
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang3.StringUtils;
@@ -339,7 +340,8 @@ public class UsersServiceImpl extends BaseServiceImpl implements UsersService {
return result;
}
if (!isAdmin(loginUser)) {
- logger.warn("User does not have permission for this feature, userId:{}, userName:{}.", loginUser.getId(), loginUser.getUserName());
+ logger.warn("User does not have permission for this feature, userId:{}, userName:{}.", loginUser.getId(),
+ loginUser.getUserName());
putMsg(result, Status.USER_NO_OPERATION_PERM);
return result;
}
@@ -390,7 +392,8 @@ public class UsersServiceImpl extends BaseServiceImpl implements UsersService {
return result;
}
if (check(result, !canOperator(loginUser, userId), Status.USER_NO_OPERATION_PERM)) {
- logger.warn("User does not have permission for this feature, userId:{}, userName:{}.", loginUser.getId(), loginUser.getUserName());
+ logger.warn("User does not have permission for this feature, userId:{}, userName:{}.", loginUser.getId(),
+ loginUser.getUserName());
return result;
}
User user = userMapper.selectById(userId);
@@ -441,7 +444,8 @@ public class UsersServiceImpl extends BaseServiceImpl implements UsersService {
}
if (state == 0 && user.getState() != state && Objects.equals(loginUser.getId(), user.getId())) {
- logger.warn("Not allow to disable your own account, userId:{}, userName:{}.", user.getId(), user.getUserName());
+ logger.warn("Not allow to disable your own account, userId:{}, userName:{}.", user.getId(),
+ user.getUserName());
putMsg(result, Status.NOT_ALLOW_TO_DISABLE_OWN_ACCOUNT);
return result;
}
@@ -492,7 +496,8 @@ public class UsersServiceImpl extends BaseServiceImpl implements UsersService {
}
// only admin can operate
if (!isAdmin(loginUser)) {
- logger.warn("User does not have permission for this feature, userId:{}, userName:{}.", loginUser.getId(), loginUser.getUserName());
+ logger.warn("User does not have permission for this feature, userId:{}, userName:{}.", loginUser.getId(),
+ loginUser.getUserName());
putMsg(result, Status.USER_NO_OPERATION_PERM, id);
return result;
}
@@ -508,7 +513,8 @@ public class UsersServiceImpl extends BaseServiceImpl implements UsersService {
if (CollectionUtils.isNotEmpty(projects)) {
String projectNames = projects.stream().map(Project::getName).collect(Collectors.joining(","));
putMsg(result, Status.TRANSFORM_PROJECT_OWNERSHIP, projectNames);
- logger.warn("Please transfer the project ownership before deleting the user, userId:{}, projects:{}.", id, projectNames);
+ logger.warn("Please transfer the project ownership before deleting the user, userId:{}, projects:{}.", id,
+ projectNames);
return result;
}
// delete user
@@ -610,7 +616,8 @@ public class UsersServiceImpl extends BaseServiceImpl implements UsersService {
// 3. only project owner can operate
if (!this.canOperator(loginUser, project.getUserId())) {
- logger.warn("User does not have permission for project, userId:{}, userName:{}, projectCode:{}.", loginUser.getId(), loginUser.getUserName(), projectCode);
+ logger.warn("User does not have permission for project, userId:{}, userName:{}, projectCode:{}.",
+ loginUser.getId(), loginUser.getUserName(), projectCode);
this.putMsg(result, Status.USER_NO_OPERATION_PERM);
return result;
}
@@ -777,7 +784,8 @@ public class UsersServiceImpl extends BaseServiceImpl implements UsersService {
}
- logger.info("User is granted permission for resources, userId:{}, resourceIds:{}.", user.getId(), needAuthorizeResIds);
+ logger.info("User is granted permission for resources, userId:{}, resourceIds:{}.", user.getId(),
+ needAuthorizeResIds);
putMsg(result, Status.SUCCESS);
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/WorkFlowLineageServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/WorkFlowLineageServiceImpl.java
index 791d4acc22..91893f6027 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/WorkFlowLineageServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/WorkFlowLineageServiceImpl.java
@@ -86,7 +86,8 @@ public class WorkFlowLineageServiceImpl extends BaseServiceImpl implements WorkF
putMsg(result, Status.PROJECT_NOT_FOUND, projectCode);
return result;
}
- List<WorkFlowLineage> workFlowLineageList = workFlowLineageMapper.queryWorkFlowLineageByName(projectCode, workFlowName);
+ List<WorkFlowLineage> workFlowLineageList =
+ workFlowLineageMapper.queryWorkFlowLineageByName(projectCode, workFlowName);
result.put(Constants.DATA_LIST, workFlowLineageList);
putMsg(result, Status.SUCCESS);
return result;
@@ -116,23 +117,26 @@ public class WorkFlowLineageServiceImpl extends BaseServiceImpl implements WorkF
long sourceWorkFlowCode,
List<WorkFlowLineage> workFlowLineages,
Set<WorkFlowRelation> workFlowRelations) {
- workFlowLineages.add(workFlowLineageMapper.queryWorkFlowLineageByCode(projectCode,sourceWorkFlowCode));
+ workFlowLineages.add(workFlowLineageMapper.queryWorkFlowLineageByCode(projectCode, sourceWorkFlowCode));
List<WorkFlowLineage> downStreamWorkFlowLineages =
workFlowLineageMapper.queryDownstreamLineageByProcessDefinitionCode(sourceWorkFlowCode, "DEPENDENT");
workFlowLineages.addAll(downStreamWorkFlowLineages);
- downStreamWorkFlowLineages.forEach(workFlowLineage -> workFlowRelations.add(new WorkFlowRelation(sourceWorkFlowCode, workFlowLineage.getWorkFlowCode())));
+ downStreamWorkFlowLineages.forEach(workFlowLineage -> workFlowRelations
+ .add(new WorkFlowRelation(sourceWorkFlowCode, workFlowLineage.getWorkFlowCode())));
List<WorkFlowLineage> upstreamWorkFlowLineages = new ArrayList<>();
getUpstreamLineages(sourceWorkFlowCode, upstreamWorkFlowLineages);
workFlowLineages.addAll(upstreamWorkFlowLineages);
- upstreamWorkFlowLineages.forEach(workFlowLineage -> workFlowRelations.add(new WorkFlowRelation(workFlowLineage.getWorkFlowCode(), sourceWorkFlowCode)));
+ upstreamWorkFlowLineages.forEach(workFlowLineage -> workFlowRelations
+ .add(new WorkFlowRelation(workFlowLineage.getWorkFlowCode(), sourceWorkFlowCode)));
}
private void getUpstreamLineages(long sourceWorkFlowCode,
List<WorkFlowLineage> upstreamWorkFlowLineages) {
List<DependentProcessDefinition> workFlowDependentDefinitionList =
- workFlowLineageMapper.queryUpstreamDependentParamsByProcessDefinitionCode(sourceWorkFlowCode, "DEPENDENT");
+ workFlowLineageMapper.queryUpstreamDependentParamsByProcessDefinitionCode(sourceWorkFlowCode,
+ "DEPENDENT");
List<Long> upstreamProcessDefinitionCodes = new ArrayList<>();
@@ -151,7 +155,8 @@ public class WorkFlowLineageServiceImpl extends BaseServiceImpl implements WorkF
private void getProcessDefinitionCodeByDependentDefinitionList(List<DependentProcessDefinition> dependentDefinitionList,
List<Long> processDefinitionCodes) {
for (DependentProcessDefinition dependentProcessDefinition : dependentDefinitionList) {
- for (DependentTaskModel dependentTaskModel : dependentProcessDefinition.getDependentParameters().getDependTaskList()) {
+ for (DependentTaskModel dependentTaskModel : dependentProcessDefinition.getDependentParameters()
+ .getDependTaskList()) {
for (DependentItem dependentItem : dependentTaskModel.getDependItemList()) {
if (!processDefinitionCodes.contains(dependentItem.getDefinitionCode())) {
processDefinitionCodes.add(dependentItem.getDefinitionCode());
@@ -174,8 +179,10 @@ public class WorkFlowLineageServiceImpl extends BaseServiceImpl implements WorkF
Map<Long, WorkFlowLineage> workFlowLineagesMap = new HashMap<>();
Set<WorkFlowRelation> workFlowRelations = new HashSet<>();
if (!processLineages.isEmpty()) {
- List<WorkFlowLineage> workFlowLineages = workFlowLineageMapper.queryWorkFlowLineageByLineage(processLineages);
- workFlowLineagesMap = workFlowLineages.stream().collect(Collectors.toMap(WorkFlowLineage::getWorkFlowCode, workFlowLineage -> workFlowLineage));
+ List<WorkFlowLineage> workFlowLineages =
+ workFlowLineageMapper.queryWorkFlowLineageByLineage(processLineages);
+ workFlowLineagesMap = workFlowLineages.stream()
+ .collect(Collectors.toMap(WorkFlowLineage::getWorkFlowCode, workFlowLineage -> workFlowLineage));
Map<Long, List<TaskDefinition>> workFlowMap = new HashMap<>();
for (ProcessLineage processLineage : processLineages) {
workFlowMap.compute(processLineage.getProcessDefinitionCode(), (k, v) -> {
@@ -186,18 +193,22 @@ public class WorkFlowLineageServiceImpl extends BaseServiceImpl implements WorkF
v.add(new TaskDefinition(processLineage.getPreTaskCode(), processLineage.getPreTaskVersion()));
}
if (processLineage.getPostTaskCode() > 0) {
- v.add(new TaskDefinition(processLineage.getPostTaskCode(), processLineage.getPostTaskVersion()));
+ v.add(new TaskDefinition(processLineage.getPostTaskCode(),
+ processLineage.getPostTaskVersion()));
}
return v;
});
}
for (Entry<Long, List<TaskDefinition>> workFlow : workFlowMap.entrySet()) {
- Set<Long> sourceWorkFlowCodes = querySourceWorkFlowCodes(projectCode, workFlow.getKey(), workFlow.getValue());
+ Set<Long> sourceWorkFlowCodes =
+ querySourceWorkFlowCodes(projectCode, workFlow.getKey(), workFlow.getValue());
if (sourceWorkFlowCodes.isEmpty()) {
workFlowRelations.add(new WorkFlowRelation(0L, workFlow.getKey()));
} else {
- workFlowLineagesMap.get(workFlow.getKey()).setSourceWorkFlowCode(StringUtils.join(sourceWorkFlowCodes, Constants.COMMA));
- sourceWorkFlowCodes.forEach(code -> workFlowRelations.add(new WorkFlowRelation(code, workFlow.getKey())));
+ workFlowLineagesMap.get(workFlow.getKey())
+ .setSourceWorkFlowCode(StringUtils.join(sourceWorkFlowCodes, Constants.COMMA));
+ sourceWorkFlowCodes
+ .forEach(code -> workFlowRelations.add(new WorkFlowRelation(code, workFlow.getKey())));
}
}
}
@@ -209,7 +220,8 @@ public class WorkFlowLineageServiceImpl extends BaseServiceImpl implements WorkF
return result;
}
- private Set<Long> querySourceWorkFlowCodes(long projectCode, long workFlowCode, List<TaskDefinition> taskDefinitionList) {
+ private Set<Long> querySourceWorkFlowCodes(long projectCode, long workFlowCode,
+ List<TaskDefinition> taskDefinitionList) {
Set<Long> sourceWorkFlowCodes = new HashSet<>();
if (taskDefinitionList == null || taskDefinitionList.isEmpty()) {
return sourceWorkFlowCodes;
@@ -218,14 +230,16 @@ public class WorkFlowLineageServiceImpl extends BaseServiceImpl implements WorkF
for (TaskDefinitionLog taskDefinitionLog : taskDefinitionLogs) {
if (taskDefinitionLog.getProjectCode() == projectCode) {
if (taskDefinitionLog.getTaskType().equals(TASK_TYPE_DEPENDENT)) {
- DependentParameters dependentParameters = JSONUtils.parseObject(taskDefinitionLog.getDependence(), DependentParameters.class);
+ DependentParameters dependentParameters =
+ JSONUtils.parseObject(taskDefinitionLog.getDependence(), DependentParameters.class);
if (dependentParameters != null) {
List<DependentTaskModel> dependTaskList = dependentParameters.getDependTaskList();
if (!CollectionUtils.isEmpty(dependTaskList)) {
for (DependentTaskModel taskModel : dependTaskList) {
List<DependentItem> dependItemList = taskModel.getDependItemList();
for (DependentItem dependentItem : dependItemList) {
- if (dependentItem.getProjectCode() == projectCode && dependentItem.getDefinitionCode() != workFlowCode) {
+ if (dependentItem.getProjectCode() == projectCode
+ && dependentItem.getDefinitionCode() != workFlowCode) {
sourceWorkFlowCodes.add(dependentItem.getDefinitionCode());
}
}
@@ -248,14 +262,18 @@ public class WorkFlowLineageServiceImpl extends BaseServiceImpl implements WorkF
*/
@Override
public Optional<String> taskDepOnTaskMsg(long projectCode, long processDefinitionCode, long taskCode) {
- List<TaskMainInfo> tasksDep = workFlowLineageMapper.queryTaskDepOnTask(projectCode, processDefinitionCode, taskCode);
+ List<TaskMainInfo> tasksDep =
+ workFlowLineageMapper.queryTaskDepOnTask(projectCode, processDefinitionCode, taskCode);
if (CollectionUtils.isEmpty(tasksDep)) {
return Optional.empty();
}
- String taskDepStr = tasksDep.stream().map(task -> String.format(Constants.FORMAT_S_S_COLON, task.getProcessDefinitionName(), task.getTaskName())).collect(Collectors.joining(Constants.COMMA));
+ String taskDepStr = tasksDep.stream().map(
+ task -> String.format(Constants.FORMAT_S_S_COLON, task.getProcessDefinitionName(), task.getTaskName()))
+ .collect(Collectors.joining(Constants.COMMA));
TaskDefinition taskDefinition = taskDefinitionMapper.queryByCode(taskCode);
- return Optional.of(MessageFormat.format(Status.DELETE_TASK_USE_BY_OTHER_FAIL.getMsg(), taskDefinition.getName(), taskDepStr));
+ return Optional.of(MessageFormat.format(Status.DELETE_TASK_USE_BY_OTHER_FAIL.getMsg(), taskDefinition.getName(),
+ taskDepStr));
}
/**
@@ -268,8 +286,10 @@ public class WorkFlowLineageServiceImpl extends BaseServiceImpl implements WorkF
@Override
public Set<TaskMainInfo> queryTaskDepOnProcess(long projectCode, long processDefinitionCode) {
Set<TaskMainInfo> taskMainInfos = new HashSet<>();
- List<TaskMainInfo> taskDependents = workFlowLineageMapper.queryTaskDependentDepOnProcess(projectCode, processDefinitionCode);
- List<TaskMainInfo> taskSubProcess = workFlowLineageMapper.queryTaskSubProcessDepOnProcess(projectCode, processDefinitionCode);
+ List<TaskMainInfo> taskDependents =
+ workFlowLineageMapper.queryTaskDependentDepOnProcess(projectCode, processDefinitionCode);
+ List<TaskMainInfo> taskSubProcess =
+ workFlowLineageMapper.queryTaskSubProcessDepOnProcess(projectCode, processDefinitionCode);
taskMainInfos.addAll(taskDependents);
taskMainInfos.addAll(taskSubProcess);
return taskMainInfos;
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/WorkerGroupServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/WorkerGroupServiceImpl.java
index d95a2017f3..41f4cf8bfa 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/WorkerGroupServiceImpl.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/WorkerGroupServiceImpl.java
@@ -322,7 +322,8 @@ public class WorkerGroupServiceImpl extends BaseServiceImpl implements WorkerGro
return result;
}
List<ProcessInstance> processInstances = processInstanceMapper
- .queryByWorkerGroupNameAndStatus(workerGroup.getName(), org.apache.dolphinscheduler.service.utils.Constants.NOT_TERMINATED_STATES);
+ .queryByWorkerGroupNameAndStatus(workerGroup.getName(),
+ org.apache.dolphinscheduler.service.utils.Constants.NOT_TERMINATED_STATES);
if (CollectionUtils.isNotEmpty(processInstances)) {
List<Integer> processInstanceIds =
processInstances.stream().map(ProcessInstance::getId).collect(Collectors.toList());
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/CheckUtils.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/CheckUtils.java
index 33dd23113f..b3e5c95844 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/CheckUtils.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/CheckUtils.java
@@ -17,6 +17,9 @@
package org.apache.dolphinscheduler.api.utils;
+import static org.apache.dolphinscheduler.common.Constants.USER_PASSWORD_MAX_LENGTH;
+import static org.apache.dolphinscheduler.common.Constants.USER_PASSWORD_MIN_LENGTH;
+
import org.apache.dolphinscheduler.api.enums.Status;
import org.apache.dolphinscheduler.common.Constants;
import org.apache.dolphinscheduler.common.utils.JSONUtils;
@@ -31,9 +34,6 @@ import java.util.regex.Pattern;
import org.hibernate.validator.internal.constraintvalidators.bv.EmailValidator;
-import static org.apache.dolphinscheduler.common.Constants.USER_PASSWORD_MAX_LENGTH;
-import static org.apache.dolphinscheduler.common.Constants.USER_PASSWORD_MIN_LENGTH;
-
/**
* check utils
*/
@@ -67,7 +67,7 @@ public class CheckUtils {
if (!emailValidator.isValid(email, null)) {
return false;
}
- //Email is at least a second-level domain name
+ // Email is at least a second-level domain name
int indexDomain = email.lastIndexOf("@");
String domainString = email.substring(indexDomain);
return domainString.contains(".");
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/FileUtils.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/FileUtils.java
index f85a7b111c..94771a4191 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/FileUtils.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/FileUtils.java
@@ -36,6 +36,7 @@ import org.springframework.web.multipart.MultipartFile;
* file utils
*/
public class FileUtils {
+
private static final Logger logger = LoggerFactory.getLogger(FileUtils.class);
/**
diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/PageInfo.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/PageInfo.java
index b9513b2cc4..ba5735f402 100644
--- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/PageInfo.java
+++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/PageInfo.java
@@ -53,7 +53,7 @@ public class PageInfo<T> {
private Integer pageNo;
public PageInfo() {
-
+
}
public PageInfo(Integer currentPage, Integer pageSize) {
@@ -128,4 +128,4 @@ public class PageInfo<T> {
public void setCurrentPage(Integer currentPage) {
this.currentPage = currentPage;
}
-}
\ No newline at end of file
+}
diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/WorkerGroupControllerTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/WorkerGroupControllerTest.java
index 297fc988b9..d3236786e2 100644
--- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/WorkerGroupControllerTest.java
+++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/WorkerGroupControllerTest.java
@@ -24,7 +24,6 @@ import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.
import static org.springframework.test.web.servlet.result.MockMvcResultMatchers.status;
import org.apache.dolphinscheduler.api.utils.Result;
-import org.apache.dolphinscheduler.common.Constants;
import org.apache.dolphinscheduler.common.enums.NodeType;
import org.apache.dolphinscheduler.common.utils.JSONUtils;
import org.apache.dolphinscheduler.dao.entity.WorkerGroup;
@@ -134,7 +133,8 @@ public class WorkerGroupControllerTest extends AbstractControllerTest {
workerGroup.setId(12);
workerGroup.setName("测试");
Mockito.when(workerGroupMapper.selectById(12)).thenReturn(workerGroup);
- Mockito.when(processInstanceMapper.queryByWorkerGroupNameAndStatus("测试", org.apache.dolphinscheduler.service.utils.Constants.NOT_TERMINATED_STATES))
+ Mockito.when(processInstanceMapper.queryByWorkerGroupNameAndStatus("测试",
+ org.apache.dolphinscheduler.service.utils.Constants.NOT_TERMINATED_STATES))
.thenReturn(null);
Mockito.when(workerGroupMapper.deleteById(12)).thenReturn(1);
Mockito.when(processInstanceMapper.updateProcessInstanceByWorkerGroupName("测试", "")).thenReturn(1);
diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/BaseServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/BaseServiceTest.java
index 325b499841..bc01e1ba93 100644
--- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/BaseServiceTest.java
+++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/BaseServiceTest.java
@@ -24,6 +24,7 @@ import org.apache.dolphinscheduler.common.Constants;
import org.apache.dolphinscheduler.common.enums.UserType;
import org.apache.dolphinscheduler.dao.entity.User;
import org.apache.dolphinscheduler.service.storage.impl.HadoopUtils;
+
import java.util.HashMap;
import java.util.Map;
diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessInstanceServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessInstanceServiceTest.java
index 08b06b720f..7bfaf3ca1e 100644
--- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessInstanceServiceTest.java
+++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessInstanceServiceTest.java
@@ -284,7 +284,7 @@ public class ProcessInstanceServiceTest {
when(projectMapper.queryByCode(projectCode)).thenReturn(project);
when(projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_INSTANCE)).thenReturn(result);
projectAuthFailRes = processInstanceService
- .queryTopNLongestRunningProcessInstance(loginUser, projectCode, -1, startTime, endTime);
+ .queryTopNLongestRunningProcessInstance(loginUser, projectCode, -1, startTime, endTime);
Assertions.assertEquals(Status.NEGTIVE_SIZE_NUMBER_ERROR, projectAuthFailRes.get(Constants.STATUS));
putMsg(result, Status.SUCCESS, projectCode);
@@ -294,7 +294,7 @@ public class ProcessInstanceServiceTest {
when(usersService.getUserIdByName(loginUser.getUserName())).thenReturn(loginUser.getId());
when(usersService.queryUser(processInstance.getExecutorId())).thenReturn(loginUser);
Map<String, Object> successRes = processInstanceService.queryTopNLongestRunningProcessInstance(loginUser,
- projectCode, size, startTime, endTime);
+ projectCode, size, startTime, endTime);
Assertions.assertEquals(Status.SUCCESS, successRes.get(Constants.STATUS));
}
@@ -314,21 +314,22 @@ public class ProcessInstanceServiceTest {
when(projectMapper.queryByCode(projectCode)).thenReturn(project);
when(projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_INSTANCE)).thenReturn(result);
Map<String, Object> startTimeBiggerFailRes = processInstanceService
- .queryTopNLongestRunningProcessInstance(loginUser, projectCode, size, endTime, startTime);
- Assertions.assertEquals(Status.START_TIME_BIGGER_THAN_END_TIME_ERROR, startTimeBiggerFailRes.get(Constants.STATUS));
+ .queryTopNLongestRunningProcessInstance(loginUser, projectCode, size, endTime, startTime);
+ Assertions.assertEquals(Status.START_TIME_BIGGER_THAN_END_TIME_ERROR,
+ startTimeBiggerFailRes.get(Constants.STATUS));
putMsg(result, Status.SUCCESS, projectCode);
when(projectMapper.queryByCode(projectCode)).thenReturn(project);
when(projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_INSTANCE)).thenReturn(result);
Map<String, Object> dataNullFailRes = processInstanceService
- .queryTopNLongestRunningProcessInstance(loginUser, projectCode, size, null, endTime);
+ .queryTopNLongestRunningProcessInstance(loginUser, projectCode, size, null, endTime);
Assertions.assertEquals(Status.DATA_IS_NULL, dataNullFailRes.get(Constants.STATUS));
putMsg(result, Status.SUCCESS, projectCode);
when(projectMapper.queryByCode(projectCode)).thenReturn(project);
when(projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_INSTANCE)).thenReturn(result);
dataNullFailRes = processInstanceService
- .queryTopNLongestRunningProcessInstance(loginUser, projectCode, size, startTime, null);
+ .queryTopNLongestRunningProcessInstance(loginUser, projectCode, size, startTime, null);
Assertions.assertEquals(Status.DATA_IS_NULL, dataNullFailRes.get(Constants.STATUS));
}
@@ -344,7 +345,7 @@ public class ProcessInstanceServiceTest {
when(projectMapper.queryByCode(projectCode)).thenReturn(project);
when(projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_INSTANCE)).thenReturn(result);
Map<String, Object> projectAuthFailRes =
- processInstanceService.queryProcessInstanceById(loginUser, projectCode, 1);
+ processInstanceService.queryProcessInstanceById(loginUser, projectCode, 1);
Assertions.assertEquals(Status.PROJECT_NOT_FOUND, projectAuthFailRes.get(Constants.STATUS));
// project auth success
@@ -371,7 +372,7 @@ public class ProcessInstanceServiceTest {
Assertions.assertEquals(Status.SUCCESS, workerExistRes.get(Constants.STATUS));
when(processService.findProcessDefinition(processInstance.getProcessDefinitionCode(),
- processInstance.getProcessDefinitionVersion())).thenReturn(null);;
+ processInstance.getProcessDefinitionVersion())).thenReturn(null);;
workerExistRes = processInstanceService.queryProcessInstanceById(loginUser, projectCode, 1);
Assertions.assertEquals(Status.PROCESS_DEFINE_NOT_EXIST, workerExistRes.get(Constants.STATUS));
}
@@ -388,7 +389,7 @@ public class ProcessInstanceServiceTest {
when(projectMapper.queryByCode(projectCode)).thenReturn(project);
when(projectService.checkProjectAndAuth(loginUser, project, projectCode, WORKFLOW_INSTANCE)).thenReturn(result);
Map<String, Object> projectAuthFailRes =
- processInstanceService.queryTaskListByProcessId(loginUser, projectCode, 1);
+ processInstanceService.queryTaskListByProcessId(loginUser, projectCode, 1);
Assertions.assertEquals(Status.PROJECT_NOT_FOUND, projectAuthFailRes.get(Constants.STATUS));
// project auth success
@@ -638,7 +639,7 @@ public class ProcessInstanceServiceTest {
when(projectMapper.queryByCode(projectCode)).thenReturn(project);
when(projectService.checkProjectAndAuth(loginUser, project, projectCode, INSTANCE_DELETE)).thenReturn(result);
Map<String, Object> projectAuthFailRes =
- processInstanceService.deleteProcessInstanceById(loginUser, projectCode, 1);
+ processInstanceService.deleteProcessInstanceById(loginUser, projectCode, 1);
Assertions.assertEquals(Status.PROJECT_NOT_FOUND, projectAuthFailRes.get(Constants.STATUS));
// not sub process
@@ -675,7 +676,7 @@ public class ProcessInstanceServiceTest {
processDefinition.setProjectCode(projectCode);
when(processService.deleteWorkProcessInstanceById(1)).thenReturn(1);
Map<String, Object> successRes =
- processInstanceService.deleteProcessInstanceById(loginUser, projectCode, 1);
+ processInstanceService.deleteProcessInstanceById(loginUser, projectCode, 1);
Assertions.assertEquals(Status.SUCCESS, successRes.get(Constants.STATUS));
when(processService.deleteWorkProcessInstanceById(1)).thenReturn(0);
diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessTaskRelationServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessTaskRelationServiceTest.java
index b1ae0537a0..b5b99de843 100644
--- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessTaskRelationServiceTest.java
+++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessTaskRelationServiceTest.java
@@ -52,6 +52,7 @@ import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.stream.Collectors;
+
import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.BeforeEach;
import org.junit.jupiter.api.Test;
diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/TenantServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/TenantServiceTest.java
index 8b38bd101c..3509a288cb 100644
--- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/TenantServiceTest.java
+++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/TenantServiceTest.java
@@ -205,7 +205,8 @@ public class TenantServiceTest {
Mockito.when(resourcePermissionCheckService.resourcePermissionCheck(AuthorizationType.TENANT, null, 0,
baseServiceLogger)).thenReturn(true);
Mockito.when(tenantMapper.queryById(1)).thenReturn(getTenant());
- Mockito.when(processInstanceMapper.queryByTenantIdAndStatus(1, org.apache.dolphinscheduler.service.utils.Constants.NOT_TERMINATED_STATES))
+ Mockito.when(processInstanceMapper.queryByTenantIdAndStatus(1,
+ org.apache.dolphinscheduler.service.utils.Constants.NOT_TERMINATED_STATES))
.thenReturn(getInstanceList());
Mockito.when(processDefinitionMapper.queryDefinitionListByTenant(2)).thenReturn(getDefinitionsList());
Mockito.when(userMapper.queryUserListByTenant(3)).thenReturn(getUserList());
diff --git a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/WorkerGroupServiceTest.java b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/WorkerGroupServiceTest.java
index 5929725cfd..e80233c633 100644
--- a/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/WorkerGroupServiceTest.java
+++ b/dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/WorkerGroupServiceTest.java
@@ -86,7 +86,9 @@ public class WorkerGroupServiceTest {
user.setUserType(UserType.ADMIN_USER);
WorkerGroup wg2 = getWorkerGroup(2);
Mockito.when(workerGroupMapper.selectById(2)).thenReturn(wg2);
- Mockito.when(processInstanceMapper.queryByWorkerGroupNameAndStatus(wg2.getName(), org.apache.dolphinscheduler.service.utils.Constants.NOT_TERMINATED_STATES)).thenReturn(getProcessInstanceList());
+ Mockito.when(processInstanceMapper.queryByWorkerGroupNameAndStatus(wg2.getName(),
+ org.apache.dolphinscheduler.service.utils.Constants.NOT_TERMINATED_STATES))
+ .thenReturn(getProcessInstanceList());
Map<String, Object> result = workerGroupService.deleteWorkerGroupById(user, 1);
Assertions.assertEquals(Status.DELETE_WORKER_GROUP_NOT_EXIST.getCode(),
((Status) result.get(Constants.STATUS)).getCode());
@@ -96,7 +98,9 @@ public class WorkerGroupServiceTest {
// correct
WorkerGroup wg3 = getWorkerGroup(3);
Mockito.when(workerGroupMapper.selectById(3)).thenReturn(wg3);
- Mockito.when(processInstanceMapper.queryByWorkerGroupNameAndStatus(wg3.getName(), org.apache.dolphinscheduler.service.utils.Constants.NOT_TERMINATED_STATES)).thenReturn(new ArrayList<>());
+ Mockito.when(processInstanceMapper.queryByWorkerGroupNameAndStatus(wg3.getName(),
+ org.apache.dolphinscheduler.service.utils.Constants.NOT_TERMINATED_STATES))
+ .thenReturn(new ArrayList<>());
result = workerGroupService.deleteWorkerGroupById(user, 3);
Assertions.assertEquals(Status.SUCCESS.getMsg(), result.get(Constants.MSG));
}
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/config/YamlPropertySourceFactory.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/config/YamlPropertySourceFactory.java
index 8c9bd2fe74..57467d0a14 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/config/YamlPropertySourceFactory.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/config/YamlPropertySourceFactory.java
@@ -17,15 +17,15 @@
package org.apache.dolphinscheduler.common.config;
+import java.io.IOException;
+import java.util.Properties;
+
import org.springframework.beans.factory.config.YamlPropertiesFactoryBean;
import org.springframework.core.env.PropertiesPropertySource;
import org.springframework.core.env.PropertySource;
import org.springframework.core.io.support.EncodedResource;
import org.springframework.core.io.support.PropertySourceFactory;
-import java.io.IOException;
-import java.util.Properties;
-
public class YamlPropertySourceFactory implements PropertySourceFactory {
@Override
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AlertEvent.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AlertEvent.java
index 0c8ed89fd7..b46a9ed8f7 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AlertEvent.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AlertEvent.java
@@ -19,5 +19,5 @@ package org.apache.dolphinscheduler.common.enums;
public enum AlertEvent {
- SERVER_DOWN,TIME_OUT
+ SERVER_DOWN, TIME_OUT
}
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AlertStatus.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AlertStatus.java
index 14ed47ea2c..de5a87c8ae 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AlertStatus.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AlertStatus.java
@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.annotation.EnumValue;
* alert sending(execution) status
*/
public enum AlertStatus {
+
/**
* 0 waiting executed; 1 execute successfully，2 execute failed
*/
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AlertType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AlertType.java
index d5713a775a..33c1a360a8 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AlertType.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AlertType.java
@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.annotation.EnumValue;
* describe the reason why alert generates
*/
public enum AlertType {
+
/**
* 0 process instance failure, 1 process instance success, 2 process instance blocked, 3 process instance timeout, 4 fault tolerance warning,
* 5 task failure, 6 task success, 7 task timeout, 8 close alert
@@ -36,8 +37,7 @@ public enum AlertType {
TASK_SUCCESS(6, "task success"),
TASK_TIMEOUT(7, "task timeout"),
- CLOSE_ALERT(8, "the process instance success, can close the before alert")
- ;
+ CLOSE_ALERT(8, "the process instance success, can close the before alert");
AlertType(int code, String descp) {
this.code = code;
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AlertWarnLevel.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AlertWarnLevel.java
index 71579a9611..34a15e6d9b 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AlertWarnLevel.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AlertWarnLevel.java
@@ -19,5 +19,5 @@ package org.apache.dolphinscheduler.common.enums;
public enum AlertWarnLevel {
- MIDDLE,SERIOUS
+ MIDDLE, SERIOUS
}
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AuditResourceType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AuditResourceType.java
index cb6b6ca0f0..d422cd7de3 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AuditResourceType.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AuditResourceType.java
@@ -23,6 +23,7 @@ import java.util.HashMap;
* Audit Module type
*/
public enum AuditResourceType {
+
// TODO: add other audit resource enums
USER_MODULE(0, "USER"),
PROJECT_MODULE(1, "PROJECT");
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AuthorizationType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AuthorizationType.java
index f8654f4d1a..49905df3eb 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AuthorizationType.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/AuthorizationType.java
@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.annotation.EnumValue;
* Authorization type
*/
public enum AuthorizationType {
+
/**
* 0 RESOURCE_FILE_ID;
* 1 RESOURCE_FILE_NAME;
@@ -53,14 +54,14 @@ public enum AuthorizationType {
ALERT_GROUP(7, "alert group"),
ENVIRONMENT(8, "environment"),
ACCESS_TOKEN(9, "access token"),
- QUEUE(10,"queue"),
- DATA_ANALYSIS(11,"data analysis"),
- K8S_NAMESPACE(12,"k8s namespace"),
- MONITOR(13,"monitor"),
- ALERT_PLUGIN_INSTANCE(14,"alert plugin instance"),
- TENANT(15,"tenant"),
- DATA_QUALITY(16,"data quality"),
- TASK_GROUP(17,"task group"),
+ QUEUE(10, "queue"),
+ DATA_ANALYSIS(11, "data analysis"),
+ K8S_NAMESPACE(12, "k8s namespace"),
+ MONITOR(13, "monitor"),
+ ALERT_PLUGIN_INSTANCE(14, "alert plugin instance"),
+ TENANT(15, "tenant"),
+ DATA_QUALITY(16, "data quality"),
+ TASK_GROUP(17, "task group"),
;
AuthorizationType(int code, String descp) {
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/BlockingOpportunity.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/BlockingOpportunity.java
index c2d103e5d8..5fc7c5073f 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/BlockingOpportunity.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/BlockingOpportunity.java
@@ -24,7 +24,7 @@ public enum BlockingOpportunity {
private final String desc;
- BlockingOpportunity(String desc){
+ BlockingOpportunity(String desc) {
this.desc = desc;
}
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/CacheType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/CacheType.java
index f845b2083f..b288a9831a 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/CacheType.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/CacheType.java
@@ -18,6 +18,7 @@
package org.apache.dolphinscheduler.common.enums;
public enum CacheType {
+
TENANT("tenant"),
USER("user"),
QUEUE("queue"),
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/CommandType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/CommandType.java
index 35b64821af..d87bc39b79 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/CommandType.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/CommandType.java
@@ -76,7 +76,7 @@ public enum CommandType {
static {
for (CommandType commandType : CommandType.values()) {
- COMMAND_TYPE_MAP.put(commandType.code,commandType);
+ COMMAND_TYPE_MAP.put(commandType.code, commandType);
}
}
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ComplementDependentMode.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ComplementDependentMode.java
index 68f8e573d2..04c03edf1b 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ComplementDependentMode.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ComplementDependentMode.java
@@ -23,12 +23,13 @@ import com.baomidou.mybatisplus.annotation.EnumValue;
* task node depend type
*/
public enum ComplementDependentMode {
+
/**
* 0 off mode
* 1 run complement data with all dependent process
*/
- OFF_MODE(0,"off mode"),
- ALL_DEPENDENT(1,"all dependent");
+ OFF_MODE(0, "off mode"),
+ ALL_DEPENDENT(1, "all dependent");
ComplementDependentMode(int code, String desc) {
this.code = code;
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ConditionType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ConditionType.java
index a80f1d38b3..8f690bc8f8 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ConditionType.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ConditionType.java
@@ -26,6 +26,7 @@ import com.baomidou.mybatisplus.annotation.EnumValue;
* condition type
*/
public enum ConditionType {
+
/**
* 0 none
* 1 judge
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Flag.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Flag.java
index 83a7069142..80c9cae999 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Flag.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Flag.java
@@ -28,6 +28,7 @@ import com.baomidou.mybatisplus.annotation.EnumValue;
* have_alert
*/
public enum Flag {
+
/**
* 0 no
* 1 yes
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/HttpCheckCondition.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/HttpCheckCondition.java
index 278e71e738..91a9c14285 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/HttpCheckCondition.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/HttpCheckCondition.java
@@ -27,5 +27,5 @@ public enum HttpCheckCondition {
* 2 body_contains
* 3 body_not_contains
*/
- STATUS_CODE_DEFAULT,STATUS_CODE_CUSTOM, BODY_CONTAINS, BODY_NOT_CONTAINS
-}
\ No newline at end of file
+ STATUS_CODE_DEFAULT, STATUS_CODE_CUSTOM, BODY_CONTAINS, BODY_NOT_CONTAINS
+}
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/HttpMethod.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/HttpMethod.java
index 509fd7c147..4c225ff2cd 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/HttpMethod.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/HttpMethod.java
@@ -29,4 +29,4 @@ public enum HttpMethod {
* 4 delete
*/
GET, POST, HEAD, PUT, DELETE
-}
\ No newline at end of file
+}
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/HttpParametersType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/HttpParametersType.java
index 0f7299ebe5..487ae651e9 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/HttpParametersType.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/HttpParametersType.java
@@ -26,5 +26,5 @@ public enum HttpParametersType {
* 1 body;
* 2 headers;
*/
- PARAMETER,BODY,HEADERS
+ PARAMETER, BODY, HEADERS
}
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/PluginType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/PluginType.java
index b5d5f7d002..08e26b3522 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/PluginType.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/PluginType.java
@@ -28,7 +28,7 @@ public enum PluginType {
ALERT(1, "alert", true),
REGISTER(2, "register", false),
- TASK(3,"task",true);
+ TASK(3, "task", true);
PluginType(int code, String desc, boolean hasUi) {
this.code = code;
@@ -53,7 +53,6 @@ public enum PluginType {
return hasUi;
}
-
private static HashMap<Integer, PluginType> PLUGIN_TYPE_MAP = new HashMap<>();
static {
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Priority.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Priority.java
index 1ccfb6fe4e..85fd665345 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Priority.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/Priority.java
@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.annotation.EnumValue;
* define process and task priority
*/
public enum Priority {
+
/**
* 0 highest priority
* 1 higher priority
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ReleaseState.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ReleaseState.java
index 87952becd4..e11375aa5f 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ReleaseState.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ReleaseState.java
@@ -41,12 +41,12 @@ public enum ReleaseState {
private final String descp;
public static ReleaseState getEnum(int value) {
- for (ReleaseState e:ReleaseState.values()) {
+ for (ReleaseState e : ReleaseState.values()) {
if (e.ordinal() == value) {
return e;
}
}
- //For values out of enum scope
+ // For values out of enum scope
return null;
}
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/RunMode.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/RunMode.java
index 9d231cce00..f55905e745 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/RunMode.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/RunMode.java
@@ -22,7 +22,8 @@ import com.baomidou.mybatisplus.annotation.EnumValue;
/**
* complement data run mode
*/
-public enum RunMode {
+public enum RunMode {
+
/**
* 0 serial run
* 1 parallel run
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/SlotCheckState.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/SlotCheckState.java
index 731911bc3b..b37a3338d1 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/SlotCheckState.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/SlotCheckState.java
@@ -19,5 +19,5 @@ package org.apache.dolphinscheduler.common.enums;
public enum SlotCheckState {
- PASS,INJECT,CHANGE
+ PASS, INJECT, CHANGE
}
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/SqoopJobType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/SqoopJobType.java
index 2f69f060cc..17b244c745 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/SqoopJobType.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/SqoopJobType.java
@@ -19,7 +19,8 @@ package org.apache.dolphinscheduler.common.enums;
import com.baomidou.mybatisplus.annotation.EnumValue;
-public enum SqoopJobType {
+public enum SqoopJobType {
+
CUSTOM(0, "CUSTOM"),
TEMPLATE(1, "TEMPLATE");
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskDependType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskDependType.java
index 0301947564..7bc8b9d410 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskDependType.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskDependType.java
@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.annotation.EnumValue;
* task node depend type
*/
public enum TaskDependType {
+
/**
* 0 run current tasks only
* 1 run current tasks and previous tasks
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskExecuteType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskExecuteType.java
index 4694cec26d..c2c7f3a165 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskExecuteType.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskExecuteType.java
@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.annotation.EnumValue;
* task execute type
*/
public enum TaskExecuteType {
+
/**
* 0 batch
* 1 stream
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskRecordStatus.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskRecordStatus.java
index faa9d0ceab..a57ad3fe47 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskRecordStatus.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TaskRecordStatus.java
@@ -29,7 +29,6 @@ public enum TaskRecordStatus {
* 1 failure
* 2 exception
*/
- SUCCESS,FAILURE,EXCEPTION
-
+ SUCCESS, FAILURE, EXCEPTION
}
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TimeoutFlag.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TimeoutFlag.java
index f5ef952b02..9088575812 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TimeoutFlag.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/TimeoutFlag.java
@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.annotation.EnumValue;
* timeout flag
*/
public enum TimeoutFlag {
+
/**
* 0 close
* 1 open
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/UdfType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/UdfType.java
index 211061681b..9c4266bf7a 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/UdfType.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/UdfType.java
@@ -23,13 +23,14 @@ import com.baomidou.mybatisplus.annotation.EnumValue;
* UDF type
*/
public enum UdfType {
+
/**
* 0 hive; 1 spark
*/
- HIVE(0, "hive"),
- SPARK(1, "spark");
+ HIVE(0, "hive"),
+ SPARK(1, "spark");
- UdfType(int code, String descp){
+ UdfType(int code, String descp) {
this.code = code;
this.descp = descp;
}
@@ -46,14 +47,13 @@ public enum UdfType {
return descp;
}
- public static UdfType of(int type){
- for(UdfType ut : values()){
- if(ut.getCode() == type){
+ public static UdfType of(int type) {
+ for (UdfType ut : values()) {
+ if (ut.getCode() == type) {
return ut;
}
}
throw new IllegalArgumentException("invalid type : " + type);
}
-
}
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/UserType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/UserType.java
index ebab5da742..effc2cfc1e 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/UserType.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/UserType.java
@@ -23,6 +23,7 @@ import com.baomidou.mybatisplus.annotation.EnumValue;
* user type
*/
public enum UserType {
+
/**
* 0 admin user; 1 general user
*/
@@ -46,4 +47,3 @@ public enum UserType {
return descp;
}
}
-
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/WarningType.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/WarningType.java
index 65f31cc911..2ba69e944e 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/WarningType.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/WarningType.java
@@ -29,6 +29,7 @@ import com.google.common.base.Functions;
* types for whether to send warning when process ends;
*/
public enum WarningType {
+
/**
* 0 do not send warning;
* 1 send if process success;
@@ -58,7 +59,7 @@ public enum WarningType {
}
private static final Map<String, WarningType> WARNING_TYPE_MAP =
- Arrays.stream(WarningType.values()).collect(toMap(WarningType::getDescp, Functions.identity()));
+ Arrays.stream(WarningType.values()).collect(toMap(WarningType::getDescp, Functions.identity()));
public static WarningType of(String descp) {
if (WARNING_TYPE_MAP.containsKey(descp)) {
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/WorkflowExecutionStatus.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/WorkflowExecutionStatus.java
index 65e2b8d946..4fced36110 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/WorkflowExecutionStatus.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/WorkflowExecutionStatus.java
@@ -17,13 +17,15 @@
package org.apache.dolphinscheduler.common.enums;
-import com.baomidou.mybatisplus.annotation.EnumValue;
-import lombok.NonNull;
-
import java.util.HashMap;
import java.util.Map;
+import lombok.NonNull;
+
+import com.baomidou.mybatisplus.annotation.EnumValue;
+
public enum WorkflowExecutionStatus {
+
// This class is split from <code>ExecutionStatus</code> #11339.
// In order to compatible with the old value, the code is not consecutive
SUBMITTED_SUCCESS(0, "submit success"),
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/exception/StorageOperateNoConfiguredException.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/exception/StorageOperateNoConfiguredException.java
index 3aaf7980d0..b5ab837a84 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/exception/StorageOperateNoConfiguredException.java
+++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/exception/StorageOperateNoConfiguredException.java
@@ -37,7 +37,8 @@ public class StorageOperateNoConfiguredException extends RuntimeException {
super(cause);
}
- public StorageOperateNoConfiguredException(String message, Throwable cause, boolean enableSuppression, boolean writableStackTrace) {
+ public StorageOperateNoConfiguredException(String message, Throwable cause, boolean enableSuppression,
+ boolean writableStackTrace) {
super(message, cause, enableSuppression, writableStackTrace);
}
}
diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/graph/DAG.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/graph/DAG.java
index afa780163a..fb5a564cf6 100644
--- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/graph/DAG.java
... 22705 lines suppressed ...