You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@submarine.apache.org by je...@apache.org on 2022/03/28 02:03:03 UTC
[submarine] branch master updated: SUBMARINE-1207. Move server-core/workbench/entity to server-api/workbench
This is an automated email from the ASF dual-hosted git repository.
jeffliu pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/submarine.git
The following commit(s) were added to refs/heads/master by this push:
new 170c506 SUBMARINE-1207. Move server-core/workbench/entity to server-api/workbench
170c506 is described below
commit 170c5061a0e07a2fe88bab6be8f02638ec443c25
Author: Ray02250418 <b0...@ntu.edu.tw>
AuthorDate: Sun Mar 27 02:16:46 2022 +0800
SUBMARINE-1207. Move server-core/workbench/entity to server-api/workbench
### What is this PR for?
Move files under submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/entity to submarine-server/server-api/src/main/java/org/apache/submarine/server/api/workbench.
### What type of PR is it?
Refactoring
### What is the Jira issue?
https://issues.apache.org/jira/projects/SUBMARINE/issues/SUBMARINE-1207?filter=allopenissues
### Screenshots (if appropriate)
No
### Questions:
* Do the license files need updating? /No
* Are there breaking changes for older versions? No
* Does this need new documentation? No
Author: Ray02250418 <b0...@ntu.edu.tw>
Signed-off-by: Jeff Liu <je...@apache.org>
Closes #902 from Ray02250418/SUBMARINE-1207 and squashes the following commits:
2484f353 [Ray02250418] SUBMARINE-1207. Remove import from the same package
afbee930 [Ray02250418] SUBMARINE-1207. Correct typo
6a1641c9 [Ray02250418] SUBMARINE-1207. workbench/annotation to rest/workbench/annotation
23504d73 [Ray02250418] SUBMARINE-1207. workbench/rest to rest/workbench
3e587c24 [Ray02250418] SUBMARINE-1207. Move files and change import path
---
.../org/apache/submarine/server/api/workbench}/Action.java | 2 +-
.../apache/submarine/server/api/workbench}/Permission.java | 2 +-
.../org/apache/submarine/server/api/workbench}/Role.java | 2 +-
.../org/apache/submarine/server/api/workbench}/User.java | 2 +-
.../org/apache/submarine/server/api/workbench}/UserInfo.java | 2 +-
.../org/apache/submarine/server/response/DictAnnotation.java | 2 +-
.../org/apache/submarine/server/rest/ClusterRestApi.java | 2 +-
.../{workbench/rest => rest/workbench}/LoginRestApi.java | 4 ++--
.../{workbench/rest => rest/workbench}/MetricRestApi.java | 4 ++--
.../{workbench/rest => rest/workbench}/ParamRestApi.java | 4 ++--
.../{workbench/rest => rest/workbench}/ProjectRestApi.java | 4 ++--
.../{workbench/rest => rest/workbench}/SysDeptRestApi.java | 4 ++--
.../rest => rest/workbench}/SysDictItemRestApi.java | 4 ++--
.../{workbench/rest => rest/workbench}/SysDictRestApi.java | 4 ++--
.../{workbench/rest => rest/workbench}/SysUserRestApi.java | 12 ++++++------
.../{workbench/rest => rest/workbench}/SystemRestApi.java | 4 ++--
.../{workbench/rest => rest/workbench}/TeamRestApi.java | 4 ++--
.../server/{ => rest}/workbench/annotation/Dict.java | 2 +-
.../server/{ => rest}/workbench/annotation/SubmarineApi.java | 2 +-
.../server/workbench/database/entity/ProjectEntity.java | 2 +-
.../server/workbench/database/entity/SysUserEntity.java | 2 +-
.../workbench/database/service/SysDictItemService.java | 2 +-
.../{workbench/rest => rest/workbench}/CommonDataTest.java | 2 +-
.../rest => rest/workbench}/SysDeptRestApiTest.java | 4 ++--
.../rest => rest/workbench}/SysDictItemRestApiTest.java | 2 +-
.../rest => rest/workbench}/SysDictRestApiTest.java | 2 +-
.../rest => rest/workbench}/SysUserRestApiTest.java | 2 +-
.../server/workbench/database/utils/DictAnnotationTest.java | 4 ++--
28 files changed, 44 insertions(+), 44 deletions(-)
diff --git a/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/entity/Action.java b/submarine-server/server-api/src/main/java/org/apache/submarine/server/api/workbench/Action.java
similarity index 96%
rename from submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/entity/Action.java
rename to submarine-server/server-api/src/main/java/org/apache/submarine/server/api/workbench/Action.java
index 0ff6370..a3a22a7 100644
--- a/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/entity/Action.java
+++ b/submarine-server/server-api/src/main/java/org/apache/submarine/server/api/workbench/Action.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.submarine.server.workbench.entity;
+package org.apache.submarine.server.api.workbench;
public class Action {
private String action;
diff --git a/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/entity/Permission.java b/submarine-server/server-api/src/main/java/org/apache/submarine/server/api/workbench/Permission.java
similarity index 98%
rename from submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/entity/Permission.java
rename to submarine-server/server-api/src/main/java/org/apache/submarine/server/api/workbench/Permission.java
index ba62cd3..e3d99f9 100644
--- a/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/entity/Permission.java
+++ b/submarine-server/server-api/src/main/java/org/apache/submarine/server/api/workbench/Permission.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.submarine.server.workbench.entity;
+package org.apache.submarine.server.api.workbench;
import java.util.List;
diff --git a/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/entity/Role.java b/submarine-server/server-api/src/main/java/org/apache/submarine/server/api/workbench/Role.java
similarity index 98%
rename from submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/entity/Role.java
rename to submarine-server/server-api/src/main/java/org/apache/submarine/server/api/workbench/Role.java
index 1944f73..42df7f2 100644
--- a/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/entity/Role.java
+++ b/submarine-server/server-api/src/main/java/org/apache/submarine/server/api/workbench/Role.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.submarine.server.workbench.entity;
+package org.apache.submarine.server.api.workbench;
import java.util.List;
diff --git a/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/entity/User.java b/submarine-server/server-api/src/main/java/org/apache/submarine/server/api/workbench/User.java
similarity index 98%
rename from submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/entity/User.java
rename to submarine-server/server-api/src/main/java/org/apache/submarine/server/api/workbench/User.java
index 8e89188..5754a6f 100644
--- a/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/entity/User.java
+++ b/submarine-server/server-api/src/main/java/org/apache/submarine/server/api/workbench/User.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.submarine.server.workbench.entity;
+package org.apache.submarine.server.api.workbench;
public class User {
private final String id;
diff --git a/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/entity/UserInfo.java b/submarine-server/server-api/src/main/java/org/apache/submarine/server/api/workbench/UserInfo.java
similarity index 98%
rename from submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/entity/UserInfo.java
rename to submarine-server/server-api/src/main/java/org/apache/submarine/server/api/workbench/UserInfo.java
index c2d18dc..c14eb86 100644
--- a/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/entity/UserInfo.java
+++ b/submarine-server/server-api/src/main/java/org/apache/submarine/server/api/workbench/UserInfo.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.submarine.server.workbench.entity;
+package org.apache.submarine.server.api.workbench;
public class UserInfo {
private final String id;
diff --git a/submarine-server/server-core/src/main/java/org/apache/submarine/server/response/DictAnnotation.java b/submarine-server/server-core/src/main/java/org/apache/submarine/server/response/DictAnnotation.java
index ef0cc0b..27270e6 100644
--- a/submarine-server/server-core/src/main/java/org/apache/submarine/server/response/DictAnnotation.java
+++ b/submarine-server/server-core/src/main/java/org/apache/submarine/server/response/DictAnnotation.java
@@ -22,7 +22,7 @@ import net.sf.cglib.beans.BeanGenerator;
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/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/ClusterRestApi.java b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/ClusterRestApi.java
index 67ce12d..d6ca97a 100644
--- a/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/ClusterRestApi.java
+++ b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/ClusterRestApi.java
@@ -24,7 +24,7 @@ import org.apache.submarine.commons.cluster.meta.ClusterMeta;
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/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/rest/LoginRestApi.java b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/LoginRestApi.java
similarity index 95%
rename from submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/rest/LoginRestApi.java
rename to submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/LoginRestApi.java
index dd43388..00e87e0 100644
--- a/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/rest/LoginRestApi.java
+++ b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/LoginRestApi.java
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.submarine.server.workbench.rest;
+package org.apache.submarine.server.rest.workbench;
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/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/rest/MetricRestApi.java b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/MetricRestApi.java
similarity index 97%
rename from submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/rest/MetricRestApi.java
rename to submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/MetricRestApi.java
index 5b9b031..cb90849 100644
--- a/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/rest/MetricRestApi.java
+++ b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/MetricRestApi.java
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.submarine.server.workbench.rest;
+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/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/rest/ParamRestApi.java b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/ParamRestApi.java
similarity index 97%
rename from submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/rest/ParamRestApi.java
rename to submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/ParamRestApi.java
index c1fda87..55d34ca 100644
--- a/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/rest/ParamRestApi.java
+++ b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/ParamRestApi.java
@@ -16,9 +16,9 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.submarine.server.workbench.rest;
+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/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/rest/ProjectRestApi.java b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/ProjectRestApi.java
similarity index 97%
rename from submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/rest/ProjectRestApi.java
rename to submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/ProjectRestApi.java
index bd87ad8..ae0d90f 100644
--- a/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/rest/ProjectRestApi.java
+++ b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/ProjectRestApi.java
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.submarine.server.workbench.rest;
+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/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/rest/SysDeptRestApi.java b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/SysDeptRestApi.java
similarity index 98%
rename from submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/rest/SysDeptRestApi.java
rename to submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/SysDeptRestApi.java
index a1bde7c..4696371 100644
--- a/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/rest/SysDeptRestApi.java
+++ b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/SysDeptRestApi.java
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.submarine.server.workbench.rest;
+package org.apache.submarine.server.rest.workbench;
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/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/rest/SysDictItemRestApi.java b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/SysDictItemRestApi.java
similarity index 98%
rename from submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/rest/SysDictItemRestApi.java
rename to submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/SysDictItemRestApi.java
index d8f5507..c2299ef 100644
--- a/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/rest/SysDictItemRestApi.java
+++ b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/SysDictItemRestApi.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.submarine.server.workbench.rest;
+package org.apache.submarine.server.rest.workbench;
import com.github.pagehelper.PageInfo;
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/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/rest/SysDictRestApi.java b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/SysDictRestApi.java
similarity index 98%
rename from submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/rest/SysDictRestApi.java
rename to submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/SysDictRestApi.java
index 21f61ad..8ff5085 100644
--- a/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/rest/SysDictRestApi.java
+++ b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/SysDictRestApi.java
@@ -16,13 +16,13 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.submarine.server.workbench.rest;
+package org.apache.submarine.server.rest.workbench;
import com.github.pagehelper.PageInfo;
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/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/rest/SysUserRestApi.java b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/SysUserRestApi.java
similarity index 96%
rename from submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/rest/SysUserRestApi.java
rename to submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/SysUserRestApi.java
index 88cb541..96a9808 100644
--- a/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/rest/SysUserRestApi.java
+++ b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/SysUserRestApi.java
@@ -16,17 +16,17 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.submarine.server.workbench.rest;
+package org.apache.submarine.server.rest.workbench;
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.workbench.entity.Action;
-import org.apache.submarine.server.workbench.entity.Permission;
-import org.apache.submarine.server.workbench.entity.Role;
-import org.apache.submarine.server.workbench.entity.UserInfo;
+import org.apache.submarine.server.api.workbench.Action;
+import org.apache.submarine.server.api.workbench.Permission;
+import org.apache.submarine.server.api.workbench.Role;
+import org.apache.submarine.server.api.workbench.UserInfo;
import org.apache.submarine.server.response.JsonResponse;
import org.apache.submarine.server.response.JsonResponse.ListResult;
import org.slf4j.Logger;
diff --git a/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/rest/SystemRestApi.java b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/SystemRestApi.java
similarity index 97%
rename from submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/rest/SystemRestApi.java
rename to submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/SystemRestApi.java
index 7476167..d533c0b 100644
--- a/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/rest/SystemRestApi.java
+++ b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/SystemRestApi.java
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.submarine.server.workbench.rest;
+package org.apache.submarine.server.rest.workbench;
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/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/rest/TeamRestApi.java b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/TeamRestApi.java
similarity index 97%
rename from submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/rest/TeamRestApi.java
rename to submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/TeamRestApi.java
index e386f3d..eabb06b 100644
--- a/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/rest/TeamRestApi.java
+++ b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/TeamRestApi.java
@@ -16,10 +16,10 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.submarine.server.workbench.rest;
+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/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/annotation/Dict.java b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/annotation/Dict.java
similarity index 94%
rename from submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/annotation/Dict.java
rename to submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/annotation/Dict.java
index 29f7aa7..2d65007 100644
--- a/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/annotation/Dict.java
+++ b/submarine-server/server-core/src/main/java/org/apache/submarine/server/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/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/annotation/SubmarineApi.java b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/annotation/SubmarineApi.java
similarity index 95%
rename from submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/annotation/SubmarineApi.java
rename to submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/annotation/SubmarineApi.java
index 0a23396..92d4894 100644
--- a/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/annotation/SubmarineApi.java
+++ b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/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/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/database/entity/ProjectEntity.java b/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/database/entity/ProjectEntity.java
index 1d160fb..4e87c28 100644
--- a/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/database/entity/ProjectEntity.java
+++ b/submarine-server/server-core/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/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/database/entity/SysUserEntity.java b/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/database/entity/SysUserEntity.java
index 0f718b2..d0fbfa8 100644
--- a/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/database/entity/SysUserEntity.java
+++ b/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/database/entity/SysUserEntity.java
@@ -21,7 +21,7 @@ package org.apache.submarine.server.workbench.database.entity;
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;
diff --git a/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/database/service/SysDictItemService.java b/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/database/service/SysDictItemService.java
index cfe9054..5e87d5d 100644
--- a/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/database/service/SysDictItemService.java
+++ b/submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/database/service/SysDictItemService.java
@@ -20,9 +20,9 @@ package org.apache.submarine.server.workbench.database.service;
import org.apache.ibatis.session.SqlSession;
import org.apache.submarine.server.database.utils.MyBatisUtil;
+import org.apache.submarine.server.rest.workbench.SysDictRestApi;
import org.apache.submarine.server.workbench.database.entity.SysDictItemEntity;
import org.apache.submarine.server.workbench.database.mappers.SysDictItemMapper;
-import org.apache.submarine.server.workbench.rest.SysDictRestApi;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/submarine-server/server-core/src/test/java/org/apache/submarine/server/workbench/rest/CommonDataTest.java b/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/workbench/CommonDataTest.java
similarity index 99%
rename from submarine-server/server-core/src/test/java/org/apache/submarine/server/workbench/rest/CommonDataTest.java
rename to submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/workbench/CommonDataTest.java
index 7636abe..a29e3ae 100644
--- a/submarine-server/server-core/src/test/java/org/apache/submarine/server/workbench/rest/CommonDataTest.java
+++ b/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/workbench/CommonDataTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.submarine.server.workbench.rest;
+package org.apache.submarine.server.rest.workbench;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
diff --git a/submarine-server/server-core/src/test/java/org/apache/submarine/server/workbench/rest/SysDeptRestApiTest.java b/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/workbench/SysDeptRestApiTest.java
similarity index 98%
rename from submarine-server/server-core/src/test/java/org/apache/submarine/server/workbench/rest/SysDeptRestApiTest.java
rename to submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/workbench/SysDeptRestApiTest.java
index 11a6aaa..98c5bca 100644
--- a/submarine-server/server-core/src/test/java/org/apache/submarine/server/workbench/rest/SysDeptRestApiTest.java
+++ b/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/workbench/SysDeptRestApiTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.submarine.server.workbench.rest;
+package org.apache.submarine.server.rest.workbench;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
@@ -32,7 +32,7 @@ import java.util.ArrayList;
import java.util.Arrays;
import java.util.List;
-import static org.apache.submarine.server.workbench.rest.SysDeptRestApi.SHOW_ALERT;
+import static org.apache.submarine.server.rest.workbench.SysDeptRestApi.SHOW_ALERT;
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
diff --git a/submarine-server/server-core/src/test/java/org/apache/submarine/server/workbench/rest/SysDictItemRestApiTest.java b/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/workbench/SysDictItemRestApiTest.java
similarity index 99%
rename from submarine-server/server-core/src/test/java/org/apache/submarine/server/workbench/rest/SysDictItemRestApiTest.java
rename to submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/workbench/SysDictItemRestApiTest.java
index 9c3013a..e594702 100644
--- a/submarine-server/server-core/src/test/java/org/apache/submarine/server/workbench/rest/SysDictItemRestApiTest.java
+++ b/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/workbench/SysDictItemRestApiTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.submarine.server.workbench.rest;
+package org.apache.submarine.server.rest.workbench;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
diff --git a/submarine-server/server-core/src/test/java/org/apache/submarine/server/workbench/rest/SysDictRestApiTest.java b/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/workbench/SysDictRestApiTest.java
similarity index 99%
rename from submarine-server/server-core/src/test/java/org/apache/submarine/server/workbench/rest/SysDictRestApiTest.java
rename to submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/workbench/SysDictRestApiTest.java
index b09179a..8483b7b 100644
--- a/submarine-server/server-core/src/test/java/org/apache/submarine/server/workbench/rest/SysDictRestApiTest.java
+++ b/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/workbench/SysDictRestApiTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.submarine.server.workbench.rest;
+package org.apache.submarine.server.rest.workbench;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
diff --git a/submarine-server/server-core/src/test/java/org/apache/submarine/server/workbench/rest/SysUserRestApiTest.java b/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/workbench/SysUserRestApiTest.java
similarity index 98%
rename from submarine-server/server-core/src/test/java/org/apache/submarine/server/workbench/rest/SysUserRestApiTest.java
rename to submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/workbench/SysUserRestApiTest.java
index 9dd74e0..8cbecb2 100644
--- a/submarine-server/server-core/src/test/java/org/apache/submarine/server/workbench/rest/SysUserRestApiTest.java
+++ b/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/workbench/SysUserRestApiTest.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.submarine.server.workbench.rest;
+package org.apache.submarine.server.rest.workbench;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
diff --git a/submarine-server/server-core/src/test/java/org/apache/submarine/server/workbench/database/utils/DictAnnotationTest.java b/submarine-server/server-core/src/test/java/org/apache/submarine/server/workbench/database/utils/DictAnnotationTest.java
index 9f24213..4628e5a 100644
--- a/submarine-server/server-core/src/test/java/org/apache/submarine/server/workbench/database/utils/DictAnnotationTest.java
+++ b/submarine-server/server-core/src/test/java/org/apache/submarine/server/workbench/database/utils/DictAnnotationTest.java
@@ -23,9 +23,9 @@ import com.google.gson.GsonBuilder;
import com.google.gson.internal.LinkedTreeMap;
import com.google.gson.reflect.TypeToken;
import org.apache.submarine.server.response.DictAnnotation;
-import org.apache.submarine.server.workbench.rest.CommonDataTest;
-import org.apache.submarine.server.workbench.rest.SysUserRestApi;
import org.apache.submarine.server.response.JsonResponse;
+import org.apache.submarine.server.rest.workbench.CommonDataTest;
+import org.apache.submarine.server.rest.workbench.SysUserRestApi;
import org.junit.Test;
import javax.ws.rs.core.Response;
---------------------------------------------------------------------
To unsubscribe, e-mail: dev-unsubscribe@submarine.apache.org
For additional commands, e-mail: dev-help@submarine.apache.org