Improve Move exceptions and exception utility classes to the streampa…

…rk-console
apache · Jan 26, 2024 · f2a669c · f2a669c
1 parent 37e13fb
commit f2a669c
Show file tree

Hide file tree

Showing 65 changed files with 114 additions and 117 deletions.
diff --git a/...treampark/common/domain/ResponseCode.java → ...ark/console/base/domain/ResponseCode.java b/...treampark/common/domain/ResponseCode.java → ...ark/console/base/domain/ResponseCode.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.streampark.common.domain;
+package org.apache.streampark.console.base.domain;
 
 public interface ResponseCode {
 

diff --git a/...console-service/src/main/java/org/apache/streampark/console/base/domain/RestResponse.java b/...console-service/src/main/java/org/apache/streampark/console/base/domain/RestResponse.java
@@ -17,8 +17,6 @@
 
 package org.apache.streampark.console.base.domain;
 
-import org.apache.streampark.common.domain.ResponseCode;
-
 import org.slf4j.helpers.MessageFormatter;
 
 import javax.validation.constraints.NotNull;

diff --git a/...ommon/exception/AbstractApiException.java → .../base/exception/AbstractApiException.java b/...ommon/exception/AbstractApiException.java → .../base/exception/AbstractApiException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.streampark.common.exception;
+package org.apache.streampark.console.base.exception;
 
 /**
  *

diff --git a/...park/common/exception/AlertException.java → ...onsole/base/exception/AlertException.java b/...park/common/exception/AlertException.java → ...onsole/base/exception/AlertException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.streampark.common.exception;
+package org.apache.streampark.console.base.exception;
 
 import org.apache.streampark.common.util.ExceptionUtils;
 

diff --git a/...k/common/exception/ApiAlertException.java → ...ole/base/exception/ApiAlertException.java b/...k/common/exception/ApiAlertException.java → ...ole/base/exception/ApiAlertException.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.streampark.common.exception;
+package org.apache.streampark.console.base.exception;
 
-import org.apache.streampark.common.domain.ResponseCode;
+import org.apache.streampark.console.base.domain.ResponseCode;
 
 import java.util.Objects;
 

diff --git a/.../common/exception/ApiDetailException.java → ...le/base/exception/ApiDetailException.java b/.../common/exception/ApiDetailException.java → ...le/base/exception/ApiDetailException.java
@@ -15,10 +15,10 @@
  * limitations under the License.
  */
 
-package org.apache.streampark.common.exception;
+package org.apache.streampark.console.base.exception;
 
-import org.apache.streampark.common.domain.ResponseCode;
 import org.apache.streampark.common.util.ExceptionUtils;
+import org.apache.streampark.console.base.domain.ResponseCode;
 
 /**
  *

diff --git a/...ommon/exception/ApplicationException.java → .../base/exception/ApplicationException.java b/...ommon/exception/ApplicationException.java → .../base/exception/ApplicationException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.streampark.common.exception;
+package org.apache.streampark.console.base.exception;
 
 public class ApplicationException extends ApiAlertException {
   public ApplicationException(String message) {

diff --git a/...n/exception/IllegalFileTypeException.java → ...e/exception/IllegalFileTypeException.java b/...n/exception/IllegalFileTypeException.java → ...e/exception/IllegalFileTypeException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.streampark.common.exception;
+package org.apache.streampark.console.base.exception;
 
 public class IllegalFileTypeException extends ApiAlertException {
   public IllegalFileTypeException(String message) {

diff --git a/...k/common/exception/InternalException.java → ...ole/base/exception/InternalException.java b/...k/common/exception/InternalException.java → ...ole/base/exception/InternalException.java
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.streampark.common.exception;
+package org.apache.streampark.console.base.exception;
 
 /** System Internal Exception */
 public class InternalException extends Exception {

diff --git a/...vice/src/main/java/org/apache/streampark/console/base/handler/GlobalExceptionHandler.java b/...vice/src/main/java/org/apache/streampark/console/base/handler/GlobalExceptionHandler.java
@@ -17,9 +17,9 @@
 
 package org.apache.streampark.console.base.handler;
 
-import org.apache.streampark.common.domain.ResponseCode;
-import org.apache.streampark.common.exception.AbstractApiException;
+import org.apache.streampark.console.base.domain.ResponseCode;
 import org.apache.streampark.console.base.domain.RestResponse;
+import org.apache.streampark.console.base.exception.AbstractApiException;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.authz.UnauthorizedException;

diff --git a/...c/main/java/org/apache/streampark/console/base/interceptor/UploadFileTypeInterceptor.java b/...c/main/java/org/apache/streampark/console/base/interceptor/UploadFileTypeInterceptor.java
@@ -17,9 +17,9 @@
 
 package org.apache.streampark.console.base.interceptor;
 
-import org.apache.streampark.common.exception.ApiAlertException;
 import org.apache.streampark.common.util.FileUtils;
-import org.apache.streampark.common.util.PremisesUtils;
+import org.apache.streampark.console.base.exception.ApiAlertException;
+import org.apache.streampark.console.base.util.PremisesUtils;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.tika.metadata.HttpHeaders;

diff --git a/...streampark/common/util/PremisesUtils.java → ...park/console/base/util/PremisesUtils.java b/...streampark/common/util/PremisesUtils.java → ...park/console/base/util/PremisesUtils.java
@@ -15,9 +15,9 @@
  * limitations under the License.
  */
 
-package org.apache.streampark.common.util;
+package org.apache.streampark.console.base.util;
 
-import org.apache.streampark.common.exception.AbstractApiException;
+import org.apache.streampark.console.base.exception.AbstractApiException;
 
 import java.lang.reflect.InvocationTargetException;
 import java.util.Objects;

diff --git a/...onsole-service/src/main/java/org/apache/streampark/console/core/aspect/ConsoleAspect.java b/...onsole-service/src/main/java/org/apache/streampark/console/core/aspect/ConsoleAspect.java
@@ -17,9 +17,9 @@
 
 package org.apache.streampark.console.core.aspect;
 
-import org.apache.streampark.common.exception.ApiAlertException;
-import org.apache.streampark.common.util.PremisesUtils;
 import org.apache.streampark.console.base.domain.RestResponse;
+import org.apache.streampark.console.base.exception.ApiAlertException;
+import org.apache.streampark.console.base.util.PremisesUtils;
 import org.apache.streampark.console.core.annotation.ApiAccess;
 import org.apache.streampark.console.core.annotation.PermissionAction;
 import org.apache.streampark.console.core.entity.Application;

diff --git a/...-service/src/main/java/org/apache/streampark/console/core/controller/AlertController.java b/...-service/src/main/java/org/apache/streampark/console/core/controller/AlertController.java
@@ -17,10 +17,10 @@
 
 package org.apache.streampark.console.core.controller;
 
-import org.apache.streampark.common.exception.AlertException;
 import org.apache.streampark.common.util.DateUtils;
 import org.apache.streampark.console.base.domain.RestRequest;
 import org.apache.streampark.console.base.domain.RestResponse;
+import org.apache.streampark.console.base.exception.AlertException;
 import org.apache.streampark.console.core.bean.AlertConfigParams;
 import org.apache.streampark.console.core.bean.AlertTemplate;
 import org.apache.streampark.console.core.entity.AlertConfig;

diff --git a/...ce/src/main/java/org/apache/streampark/console/core/controller/ApplicationController.java b/...ce/src/main/java/org/apache/streampark/console/core/controller/ApplicationController.java
@@ -17,12 +17,12 @@
 
 package org.apache.streampark.console.core.controller;
 
-import org.apache.streampark.common.exception.InternalException;
 import org.apache.streampark.common.util.Utils;
 import org.apache.streampark.common.util.YarnUtils;
 import org.apache.streampark.console.base.domain.ApiDocConstant;
 import org.apache.streampark.console.base.domain.RestRequest;
 import org.apache.streampark.console.base.domain.RestResponse;
+import org.apache.streampark.console.base.exception.InternalException;
 import org.apache.streampark.console.core.annotation.ApiAccess;
 import org.apache.streampark.console.core.annotation.AppUpdated;
 import org.apache.streampark.console.core.annotation.PermissionAction;

diff --git a/...e/src/main/java/org/apache/streampark/console/core/controller/FlinkClusterController.java b/...e/src/main/java/org/apache/streampark/console/core/controller/FlinkClusterController.java
@@ -18,8 +18,8 @@
 package org.apache.streampark.console.core.controller;
 
 import org.apache.streampark.common.enums.ClusterState;
-import org.apache.streampark.common.exception.InternalException;
 import org.apache.streampark.console.base.domain.RestResponse;
+import org.apache.streampark.console.base.exception.InternalException;
 import org.apache.streampark.console.core.bean.ResponseResult;
 import org.apache.streampark.console.core.entity.FlinkCluster;
 import org.apache.streampark.console.core.service.FlinkClusterService;

diff --git a/...rvice/src/main/java/org/apache/streampark/console/core/controller/FlinkEnvController.java b/...rvice/src/main/java/org/apache/streampark/console/core/controller/FlinkEnvController.java
@@ -17,8 +17,8 @@
 
 package org.apache.streampark.console.core.controller;
 
-import org.apache.streampark.common.exception.ApiDetailException;
 import org.apache.streampark.console.base.domain.RestResponse;
+import org.apache.streampark.console.base.exception.ApiDetailException;
 import org.apache.streampark.console.core.entity.FlinkEnv;
 import org.apache.streampark.console.core.enums.FlinkEnvCheckEnum;
 import org.apache.streampark.console.core.service.FlinkEnvService;

diff --git a/...rvice/src/main/java/org/apache/streampark/console/core/controller/FlinkSqlController.java b/...rvice/src/main/java/org/apache/streampark/console/core/controller/FlinkSqlController.java
@@ -17,9 +17,9 @@
 
 package org.apache.streampark.console.core.controller;
 
-import org.apache.streampark.common.exception.InternalException;
 import org.apache.streampark.console.base.domain.RestRequest;
 import org.apache.streampark.console.base.domain.RestResponse;
+import org.apache.streampark.console.base.exception.InternalException;
 import org.apache.streampark.console.core.entity.Application;
 import org.apache.streampark.console.core.entity.FlinkSql;
 import org.apache.streampark.console.core.service.FlinkSqlService;

diff --git a/...ervice/src/main/java/org/apache/streampark/console/core/controller/ProjectController.java b/...ervice/src/main/java/org/apache/streampark/console/core/controller/ProjectController.java
@@ -17,10 +17,10 @@
 
 package org.apache.streampark.console.core.controller;
 
-import org.apache.streampark.common.exception.ApiAlertException;
-import org.apache.streampark.common.util.PremisesUtils;
 import org.apache.streampark.console.base.domain.RestRequest;
 import org.apache.streampark.console.base.domain.RestResponse;
+import org.apache.streampark.console.base.exception.ApiAlertException;
+import org.apache.streampark.console.base.util.PremisesUtils;
 import org.apache.streampark.console.core.annotation.AppUpdated;
 import org.apache.streampark.console.core.entity.Project;
 import org.apache.streampark.console.core.enums.GitAuthorizedErrorEnum;

diff --git a/...vice/src/main/java/org/apache/streampark/console/core/controller/SavePointController.java b/...vice/src/main/java/org/apache/streampark/console/core/controller/SavePointController.java
@@ -17,9 +17,9 @@
 
 package org.apache.streampark.console.core.controller;
 
-import org.apache.streampark.common.exception.InternalException;
 import org.apache.streampark.console.base.domain.RestRequest;
 import org.apache.streampark.console.base.domain.RestResponse;
+import org.apache.streampark.console.base.exception.InternalException;
 import org.apache.streampark.console.core.annotation.ApiAccess;
 import org.apache.streampark.console.core.entity.Application;
 import org.apache.streampark.console.core.entity.SavePoint;

diff --git a/...ark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkEnv.java b/...ark-console-service/src/main/java/org/apache/streampark/console/core/entity/FlinkEnv.java
@@ -18,9 +18,9 @@
 package org.apache.streampark.console.core.entity;
 
 import org.apache.streampark.common.conf.FlinkVersion;
-import org.apache.streampark.common.exception.ApiDetailException;
 import org.apache.streampark.common.util.DeflaterUtils;
 import org.apache.streampark.common.util.PropertiesUtils;
+import org.apache.streampark.console.base.exception.ApiDetailException;
 
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.lang3.StringUtils;

diff --git a/...park-console-service/src/main/java/org/apache/streampark/console/core/entity/Project.java b/...park-console-service/src/main/java/org/apache/streampark/console/core/entity/Project.java
@@ -20,8 +20,8 @@
 import org.apache.streampark.common.conf.CommonConfig;
 import org.apache.streampark.common.conf.InternalConfigHolder;
 import org.apache.streampark.common.conf.Workspace;
-import org.apache.streampark.common.exception.ApiDetailException;
 import org.apache.streampark.common.util.Utils;
+import org.apache.streampark.console.base.exception.ApiDetailException;
 import org.apache.streampark.console.base.util.GitUtils;
 import org.apache.streampark.console.base.util.WebUtils;
 import org.apache.streampark.console.core.enums.GitAuthorizedErrorEnum;

diff --git a/...ce/src/main/java/org/apache/streampark/console/core/service/ApplicationBackUpService.java b/...ce/src/main/java/org/apache/streampark/console/core/service/ApplicationBackUpService.java
@@ -17,8 +17,8 @@
 
 package org.apache.streampark.console.core.service;
 
-import org.apache.streampark.common.exception.InternalException;
 import org.apache.streampark.console.base.domain.RestRequest;
+import org.apache.streampark.console.base.exception.InternalException;
 import org.apache.streampark.console.core.entity.Application;
 import org.apache.streampark.console.core.entity.ApplicationBackUp;
 import org.apache.streampark.console.core.entity.FlinkSql;

diff --git a/...le-service/src/main/java/org/apache/streampark/console/core/service/SavePointService.java b/...le-service/src/main/java/org/apache/streampark/console/core/service/SavePointService.java
@@ -17,8 +17,8 @@
 
 package org.apache.streampark.console.core.service;
 
-import org.apache.streampark.common.exception.InternalException;
 import org.apache.streampark.console.base.domain.RestRequest;
+import org.apache.streampark.console.base.exception.InternalException;
 import org.apache.streampark.console.core.entity.Application;
 import org.apache.streampark.console.core.entity.SavePoint;
 

diff --git a/...ce/src/main/java/org/apache/streampark/console/core/service/alert/AlertConfigService.java b/...ce/src/main/java/org/apache/streampark/console/core/service/alert/AlertConfigService.java
@@ -17,8 +17,8 @@
 
 package org.apache.streampark.console.core.service.alert;
 
-import org.apache.streampark.common.exception.AlertException;
 import org.apache.streampark.console.base.domain.RestRequest;
+import org.apache.streampark.console.base.exception.AlertException;
 import org.apache.streampark.console.core.bean.AlertConfigParams;
 import org.apache.streampark.console.core.entity.AlertConfig;
 

diff --git a/...ce/src/main/java/org/apache/streampark/console/core/service/alert/AlertNotifyService.java b/...ce/src/main/java/org/apache/streampark/console/core/service/alert/AlertNotifyService.java
@@ -17,7 +17,7 @@
 
 package org.apache.streampark.console.core.service.alert;
 
-import org.apache.streampark.common.exception.AlertException;
+import org.apache.streampark.console.base.exception.AlertException;
 import org.apache.streampark.console.core.bean.AlertConfigParams;
 import org.apache.streampark.console.core.bean.AlertTemplate;
 

diff --git a/...in/java/org/apache/streampark/console/core/service/alert/impl/AlertConfigServiceImpl.java b/...in/java/org/apache/streampark/console/core/service/alert/impl/AlertConfigServiceImpl.java
@@ -17,10 +17,10 @@
 
 package org.apache.streampark.console.core.service.alert.impl;
 
-import org.apache.streampark.common.exception.AlertException;
-import org.apache.streampark.common.util.PremisesUtils;
 import org.apache.streampark.console.base.domain.RestRequest;
+import org.apache.streampark.console.base.exception.AlertException;
 import org.apache.streampark.console.base.mybatis.pager.MybatisPager;
+import org.apache.streampark.console.base.util.PremisesUtils;
 import org.apache.streampark.console.core.bean.AlertConfigParams;
 import org.apache.streampark.console.core.entity.AlertConfig;
 import org.apache.streampark.console.core.entity.Application;

diff --git a/...src/main/java/org/apache/streampark/console/core/service/alert/impl/AlertServiceImpl.java b/...src/main/java/org/apache/streampark/console/core/service/alert/impl/AlertServiceImpl.java
@@ -17,7 +17,7 @@
 
 package org.apache.streampark.console.core.service.alert.impl;
 
-import org.apache.streampark.common.exception.AlertException;
+import org.apache.streampark.console.base.exception.AlertException;
 import org.apache.streampark.console.base.util.SpringContextUtils;
 import org.apache.streampark.console.core.bean.AlertConfigParams;
 import org.apache.streampark.console.core.bean.AlertTemplate;

diff --git a/...org/apache/streampark/console/core/service/alert/impl/DingTalkAlertNotifyServiceImpl.java b/...org/apache/streampark/console/core/service/alert/impl/DingTalkAlertNotifyServiceImpl.java
@@ -17,9 +17,9 @@
 
 package org.apache.streampark.console.core.service.alert.impl;
 
-import org.apache.streampark.common.exception.AlertException;
-import org.apache.streampark.common.util.PremisesUtils;
+import org.apache.streampark.console.base.exception.AlertException;
 import org.apache.streampark.console.base.util.FreemarkerUtils;
+import org.apache.streampark.console.base.util.PremisesUtils;
 import org.apache.streampark.console.core.bean.AlertConfigParams;
 import org.apache.streampark.console.core.bean.AlertDingTalkParams;
 import org.apache.streampark.console.core.bean.AlertTemplate;

diff --git a/...va/org/apache/streampark/console/core/service/alert/impl/EmailAlertNotifyServiceImpl.java b/...va/org/apache/streampark/console/core/service/alert/impl/EmailAlertNotifyServiceImpl.java
@@ -17,9 +17,9 @@
 
 package org.apache.streampark.console.core.service.alert.impl;
 
-import org.apache.streampark.common.exception.AlertException;
-import org.apache.streampark.common.util.PremisesUtils;
+import org.apache.streampark.console.base.exception.AlertException;
 import org.apache.streampark.console.base.util.FreemarkerUtils;
+import org.apache.streampark.console.base.util.PremisesUtils;
 import org.apache.streampark.console.core.bean.AlertConfigParams;
 import org.apache.streampark.console.core.bean.AlertTemplate;
 import org.apache.streampark.console.core.bean.EmailConfig;

diff --git a/...apache/streampark/console/core/service/alert/impl/HttpCallbackAlertNotifyServiceImpl.java b/...apache/streampark/console/core/service/alert/impl/HttpCallbackAlertNotifyServiceImpl.java
@@ -17,9 +17,9 @@
 
 package org.apache.streampark.console.core.service.alert.impl;
 
-import org.apache.streampark.common.exception.AlertException;
-import org.apache.streampark.common.util.PremisesUtils;
+import org.apache.streampark.console.base.exception.AlertException;
 import org.apache.streampark.console.base.util.FreemarkerUtils;
+import org.apache.streampark.console.base.util.PremisesUtils;
 import org.apache.streampark.console.core.bean.AlertConfigParams;
 import org.apache.streampark.console.core.bean.AlertHttpCallbackParams;
 import org.apache.streampark.console.core.bean.AlertTemplate;

diff --git a/...ava/org/apache/streampark/console/core/service/alert/impl/LarkAlertNotifyServiceImpl.java b/...ava/org/apache/streampark/console/core/service/alert/impl/LarkAlertNotifyServiceImpl.java
@@ -17,9 +17,9 @@
 
 package org.apache.streampark.console.core.service.alert.impl;
 
-import org.apache.streampark.common.exception.AlertException;
-import org.apache.streampark.common.util.PremisesUtils;
+import org.apache.streampark.console.base.exception.AlertException;
 import org.apache.streampark.console.base.util.FreemarkerUtils;
+import org.apache.streampark.console.base.util.PremisesUtils;
 import org.apache.streampark.console.core.bean.AlertConfigParams;
 import org.apache.streampark.console.core.bean.AlertLarkParams;
 import org.apache.streampark.console.core.bean.AlertLarkRobotResponse;

diff --git a/...va/org/apache/streampark/console/core/service/alert/impl/WeComAlertNotifyServiceImpl.java b/...va/org/apache/streampark/console/core/service/alert/impl/WeComAlertNotifyServiceImpl.java
@@ -17,9 +17,9 @@
 
 package org.apache.streampark.console.core.service.alert.impl;
 
-import org.apache.streampark.common.exception.AlertException;
-import org.apache.streampark.common.util.PremisesUtils;
+import org.apache.streampark.console.base.exception.AlertException;
 import org.apache.streampark.console.base.util.FreemarkerUtils;
+import org.apache.streampark.console.base.util.PremisesUtils;
 import org.apache.streampark.console.core.bean.AlertConfigParams;
 import org.apache.streampark.console.core.bean.AlertTemplate;
 import org.apache.streampark.console.core.bean.AlertWeComParams;

diff --git a/...java/org/apache/streampark/console/core/service/application/ApplicationActionService.java b/...java/org/apache/streampark/console/core/service/application/ApplicationActionService.java
@@ -17,7 +17,7 @@
 
 package org.apache.streampark.console.core.service.application;
 
-import org.apache.streampark.common.exception.ApplicationException;
+import org.apache.streampark.console.base.exception.ApplicationException;
 import org.apache.streampark.console.core.entity.Application;
 
 import com.baomidou.mybatisplus.extension.service.IService;

diff --git a/...n/java/org/apache/streampark/console/core/service/application/ApplicationInfoService.java b/...n/java/org/apache/streampark/console/core/service/application/ApplicationInfoService.java
@@ -17,7 +17,7 @@
 
 package org.apache.streampark.console.core.service.application;
 
-import org.apache.streampark.common.exception.ApplicationException;
+import org.apache.streampark.console.base.exception.ApplicationException;
 import org.apache.streampark.console.core.entity.Application;
 import org.apache.streampark.console.core.enums.AppExistsStateEnum;
 

diff --git a/...apache/streampark/console/core/service/application/impl/ApplicationActionServiceImpl.java b/...apache/streampark/console/core/service/application/impl/ApplicationActionServiceImpl.java
@@ -26,15 +26,15 @@
 import org.apache.streampark.common.enums.FlinkExecutionMode;
 import org.apache.streampark.common.enums.FlinkRestoreMode;
 import org.apache.streampark.common.enums.ResolveOrder;
-import org.apache.streampark.common.exception.ApiAlertException;
-import org.apache.streampark.common.exception.ApplicationException;
 import org.apache.streampark.common.fs.FsOperator;
 import org.apache.streampark.common.util.DeflaterUtils;
 import org.apache.streampark.common.util.ExceptionUtils;
 import org.apache.streampark.common.util.HadoopUtils;
-import org.apache.streampark.common.util.PremisesUtils;
 import org.apache.streampark.common.util.PropertiesUtils;
 import org.apache.streampark.common.util.Utils;
+import org.apache.streampark.console.base.exception.ApiAlertException;
+import org.apache.streampark.console.base.exception.ApplicationException;
+import org.apache.streampark.console.base.util.PremisesUtils;
 import org.apache.streampark.console.core.entity.AppBuildPipeline;
 import org.apache.streampark.console.core.entity.Application;
 import org.apache.streampark.console.core.entity.ApplicationConfig;
-Original file line number
+Diff line change
@@ Expand Up / @@ -15,7 +15,7 @@ @@
      * limitations under the License.
      */
-    package org.apache.streampark.common.exception;
+    package org.apache.streampark.console.base.exception;
     /**
      *
@@ Expand Down @@