SUBMARINE-1207. Move server-core/workbench/entity to server-api/workb…

…ench

### 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 <b08901174@ntu.edu.tw>

Signed-off-by: Jeff Liu <jeffliu@apache.org>

Closes #902 from Ray02250418/SUBMARINE-1207 and squashes the following commits:

2484f35 [Ray02250418] SUBMARINE-1207. Remove import from the same package
afbee93 [Ray02250418] SUBMARINE-1207. Correct typo
6a1641c [Ray02250418] SUBMARINE-1207. workbench/annotation to rest/workbench/annotation
23504d7 [Ray02250418] SUBMARINE-1207. workbench/rest to rest/workbench
3e587c2 [Ray02250418] SUBMARINE-1207. Move files and change import path

submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/entity/Action.java → 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;

submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/entity/Permission.java → 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;
 

submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/entity/Role.java → 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;
 

submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/entity/User.java → 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;

submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/entity/UserInfo.java → 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;

submarine-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;

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.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;
 

submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/rest/LoginRestApi.java → 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;

submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/rest/MetricRestApi.java → 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;

submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/rest/ParamRestApi.java → 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;

submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/rest/ProjectRestApi.java → 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;

submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/rest/SysDeptRestApi.java → 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;

submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/rest/SysDictItemRestApi.java → 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;

submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/rest/SysDictRestApi.java → 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;

submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/rest/SysUserRestApi.java → 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;

submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/rest/SystemRestApi.java → 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;

submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/rest/TeamRestApi.java → 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;

submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/annotation/Dict.java → 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;

submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/annotation/SubmarineApi.java → 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;

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;

submarine-server/server-core/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;

submarine-server/server-core/src/main/java/org/apache/submarine/server/workbench/database/service/SysDictItemService.java

@@ -20,9 +20,9 @@
 
 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;
 

submarine-server/server-core/src/test/java/org/apache/submarine/server/workbench/rest/CommonDataTest.java → 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;

submarine-server/server-core/src/test/java/org/apache/submarine/server/workbench/rest/SysDeptRestApiTest.java → 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.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;
 

submarine-server/server-core/src/test/java/org/apache/submarine/server/workbench/rest/SysDictItemRestApiTest.java → 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;

submarine-server/server-core/src/test/java/org/apache/submarine/server/workbench/rest/SysDictRestApiTest.java → 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;

submarine-server/server-core/src/test/java/org/apache/submarine/server/workbench/rest/SysUserRestApiTest.java → 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;

submarine-server/server-core/src/test/java/org/apache/submarine/server/workbench/database/utils/DictAnnotationTest.java

@@ -23,9 +23,9 @@
 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;