SUBMARINE-1207. workbench/annotation to rest/workbench/annotation

apache · Mar 26, 2022 · 6a1641c · 6a1641c
1 parent 23504d7
commit 6a1641c
Show file tree

Hide file tree

Showing 16 changed files with 16 additions and 16 deletions.
diff --git a/...server/server-core/src/main/java/org/apache/submarine/server/response/DictAnnotation.java b/...server/server-core/src/main/java/org/apache/submarine/server/response/DictAnnotation.java
@@ -22,7 +22,7 @@
 import net.sf.cglib.beans.BeanMap;
 import org.apache.commons.lang.StringUtils;
 import org.apache.submarine.server.response.JsonResponse.ListResult;
-import org.apache.submarine.server.workbench.annotation.Dict;
+import org.apache.submarine.server.rest.workbench.annotation.Dict;
 import org.apache.submarine.server.workbench.database.entity.SysDictItemEntity;
 import org.apache.submarine.server.workbench.database.service.SysDictItemService;
 import org.slf4j.Logger;

diff --git a/...ine-server/server-core/src/main/java/org/apache/submarine/server/rest/ClusterRestApi.java b/...ine-server/server-core/src/main/java/org/apache/submarine/server/rest/ClusterRestApi.java
@@ -24,7 +24,7 @@
 import org.apache.submarine.commons.cluster.meta.ClusterMetaType;
 import org.apache.submarine.commons.utils.SubmarineConfiguration;
 import org.apache.submarine.server.response.JsonResponse;
-import org.apache.submarine.server.workbench.annotation.SubmarineApi;
+import org.apache.submarine.server.rest.workbench.annotation.SubmarineApi;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

diff --git a/...er/server-core/src/main/java/org/apache/submarine/server/rest/workbench/LoginRestApi.java b/...er/server-core/src/main/java/org/apache/submarine/server/rest/workbench/LoginRestApi.java
@@ -21,7 +21,7 @@
 import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import org.apache.ibatis.session.SqlSession;
-import org.apache.submarine.server.workbench.annotation.SubmarineApi;
+import org.apache.submarine.server.rest.workbench.annotation.SubmarineApi;
 import org.apache.submarine.server.workbench.database.entity.SysUserEntity;
 import org.apache.submarine.server.workbench.database.mappers.SysUserMapper;
 import org.apache.submarine.server.database.utils.MyBatisUtil;

diff --git a/...r/server-core/src/main/java/org/apache/submarine/server/rest/workbench/MetricRestApi.java b/...r/server-core/src/main/java/org/apache/submarine/server/rest/workbench/MetricRestApi.java
@@ -19,7 +19,7 @@
 package org.apache.submarine.server.rest.workbench;
 
 import org.apache.submarine.server.response.JsonResponse;
-import org.apache.submarine.server.workbench.annotation.SubmarineApi;
+import org.apache.submarine.server.rest.workbench.annotation.SubmarineApi;
 import org.apache.submarine.server.workbench.database.entity.MetricEntity;
 import org.apache.submarine.server.workbench.database.service.MetricService;
 import org.slf4j.Logger;

diff --git a/...er/server-core/src/main/java/org/apache/submarine/server/rest/workbench/ParamRestApi.java b/...er/server-core/src/main/java/org/apache/submarine/server/rest/workbench/ParamRestApi.java
@@ -18,7 +18,7 @@
  */
 package org.apache.submarine.server.rest.workbench;
 
-import org.apache.submarine.server.workbench.annotation.SubmarineApi;
+import org.apache.submarine.server.rest.workbench.annotation.SubmarineApi;
 import org.apache.submarine.server.workbench.database.entity.ParamEntity;
 import org.apache.submarine.server.workbench.database.service.ParamService;
 import org.apache.submarine.server.response.JsonResponse;

diff --git a/.../server-core/src/main/java/org/apache/submarine/server/rest/workbench/ProjectRestApi.java b/.../server-core/src/main/java/org/apache/submarine/server/rest/workbench/ProjectRestApi.java
@@ -19,7 +19,7 @@
 package org.apache.submarine.server.rest.workbench;
 
 import com.github.pagehelper.PageInfo;
-import org.apache.submarine.server.workbench.annotation.SubmarineApi;
+import org.apache.submarine.server.rest.workbench.annotation.SubmarineApi;
 import org.apache.submarine.server.workbench.database.entity.ProjectEntity;
 import org.apache.submarine.server.workbench.database.service.ProjectService;
 import org.apache.submarine.server.response.JsonResponse;

diff --git a/.../server-core/src/main/java/org/apache/submarine/server/rest/workbench/SysDeptRestApi.java b/.../server-core/src/main/java/org/apache/submarine/server/rest/workbench/SysDeptRestApi.java
@@ -21,7 +21,7 @@
 import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang.StringUtils;
 import org.apache.ibatis.session.SqlSession;
-import org.apache.submarine.server.workbench.annotation.SubmarineApi;
+import org.apache.submarine.server.rest.workbench.annotation.SubmarineApi;
 import org.apache.submarine.server.workbench.database.entity.SysDeptSelectEntity;
 import org.apache.submarine.server.workbench.database.entity.SysDeptTree;
 import org.apache.submarine.server.workbench.database.entity.SysDeptEntity;

diff --git a/...ver-core/src/main/java/org/apache/submarine/server/rest/workbench/SysDictItemRestApi.java b/...ver-core/src/main/java/org/apache/submarine/server/rest/workbench/SysDictItemRestApi.java
@@ -22,7 +22,7 @@
 import com.google.gson.Gson;
 import org.apache.ibatis.session.RowBounds;
 import org.apache.ibatis.session.SqlSession;
-import org.apache.submarine.server.workbench.annotation.SubmarineApi;
+import org.apache.submarine.server.rest.workbench.annotation.SubmarineApi;
 import org.apache.submarine.server.workbench.database.entity.SysDictItemEntity;
 import org.apache.submarine.server.workbench.database.mappers.SysDictItemMapper;
 import org.apache.submarine.server.workbench.database.service.SysDictItemService;

diff --git a/.../server-core/src/main/java/org/apache/submarine/server/rest/workbench/SysDictRestApi.java b/.../server-core/src/main/java/org/apache/submarine/server/rest/workbench/SysDictRestApi.java
@@ -22,7 +22,7 @@
 import com.google.gson.Gson;
 import org.apache.ibatis.session.RowBounds;
 import org.apache.ibatis.session.SqlSession;
-import org.apache.submarine.server.workbench.annotation.SubmarineApi;
+import org.apache.submarine.server.rest.workbench.annotation.SubmarineApi;
 import org.apache.submarine.server.workbench.database.entity.SysDictEntity;
 import org.apache.submarine.server.workbench.database.mappers.SysDictMapper;
 import org.apache.submarine.server.database.utils.MyBatisUtil;

diff --git a/.../server-core/src/main/java/org/apache/submarine/server/rest/workbench/SysUserRestApi.java b/.../server-core/src/main/java/org/apache/submarine/server/rest/workbench/SysUserRestApi.java
@@ -20,7 +20,7 @@
 
 import com.github.pagehelper.PageInfo;
 import com.google.gson.Gson;
-import org.apache.submarine.server.workbench.annotation.SubmarineApi;
+import org.apache.submarine.server.rest.workbench.annotation.SubmarineApi;
 import org.apache.submarine.server.workbench.database.entity.SysUserEntity;
 import org.apache.submarine.server.workbench.database.service.SysUserService;
 import org.apache.submarine.server.api.workbench.Action;

diff --git a/...r/server-core/src/main/java/org/apache/submarine/server/rest/workbench/SystemRestApi.java b/...r/server-core/src/main/java/org/apache/submarine/server/rest/workbench/SystemRestApi.java
@@ -21,7 +21,7 @@
 import com.github.pagehelper.PageInfo;
 import org.apache.commons.lang.StringUtils;
 import org.apache.ibatis.session.SqlSession;
-import org.apache.submarine.server.workbench.annotation.SubmarineApi;
+import org.apache.submarine.server.rest.workbench.annotation.SubmarineApi;
 import org.apache.submarine.server.workbench.database.entity.SysUserEntity;
 import org.apache.submarine.server.workbench.database.mappers.SystemMapper;
 import org.apache.submarine.server.workbench.database.service.SysUserService;

diff --git a/...ver/server-core/src/main/java/org/apache/submarine/server/rest/workbench/TeamRestApi.java b/...ver/server-core/src/main/java/org/apache/submarine/server/rest/workbench/TeamRestApi.java
@@ -19,7 +19,7 @@
 package org.apache.submarine.server.rest.workbench;
 
 import com.github.pagehelper.PageInfo;
-import org.apache.submarine.server.workbench.annotation.SubmarineApi;
+import org.apache.submarine.server.rest.workbench.annotation.SubmarineApi;
 import org.apache.submarine.server.workbench.database.entity.TeamEntity;
 import org.apache.submarine.server.workbench.database.service.TeamService;
 import org.apache.submarine.server.response.JsonResponse;

diff --git a/...ine/server/workbench/annotation/Dict.java → ...erver/rest/workbench/annotation/Dict.java b/...ine/server/workbench/annotation/Dict.java → ...erver/rest/workbench/annotation/Dict.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.submarine.server.workbench.annotation;
+package org.apache.submarine.server.rest.workbench.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...er/workbench/annotation/SubmarineApi.java → ...st/workbench/annotation/SubmarineApi.java b/...er/workbench/annotation/SubmarineApi.java → ...st/workbench/annotation/SubmarineApi.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.apache.submarine.server.workbench.annotation;
+package org.apache.submarine.server.rest.workbench.annotation;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;

diff --git a/...re/src/main/java/org/apache/submarine/server/workbench/database/entity/ProjectEntity.java b/...re/src/main/java/org/apache/submarine/server/workbench/database/entity/ProjectEntity.java
@@ -19,7 +19,7 @@
 package org.apache.submarine.server.workbench.database.entity;
 
 import org.apache.submarine.server.database.entity.BaseEntity;
-import org.apache.submarine.server.workbench.annotation.Dict;
+import org.apache.submarine.server.rest.workbench.annotation.Dict;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/...re/src/main/java/org/apache/submarine/server/workbench/database/entity/SysUserEntity.java b/...re/src/main/java/org/apache/submarine/server/workbench/database/entity/SysUserEntity.java
@@ -21,7 +21,7 @@
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 
 import org.apache.submarine.server.database.entity.BaseEntity;
-import org.apache.submarine.server.workbench.annotation.Dict;
+import org.apache.submarine.server.rest.workbench.annotation.Dict;
 import org.apache.submarine.server.workbench.database.utils.CustomJsonDateDeserializer;
 
 import java.util.Date;