This is an automated email from the ASF dual-hosted git repository.
pingsutw 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 2267e0bf SUBMARINE-1208. Move folder response and gson into utils
under server-core
2267e0bf is described below
commit 2267e0bfda9c139bdebfa10240525f4c1ec46898
Author: Ray02250418 <[email protected]>
AuthorDate: Tue Mar 29 20:50:34 2022 +0800
SUBMARINE-1208. Move folder response and gson into utils under server-core
### What is this PR for?
Move folder server-core/response and server-core/gson into
server-core/utils to clear the structure of the folder.
### What type of PR is it?
Refactoring
### What is the Jira issue?
https://issues.apache.org/jira/browse/SUBMARINE-1208
### How should this be tested?
No
### 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 <[email protected]>
Signed-off-by: Kevin <[email protected]>
Closes #912 from Ray02250418/SUBMARINE-1208 and squashes the following
commits:
8bf68c74 [Ray02250418] SUBMARINE-1208. Move files into folders
da5454f1 [Ray02250418] SUBMARINE-1208. Move files and refactor
---
.../experimenttemplate/ExperimentTemplateManager.java | 4 ++--
.../org/apache/submarine/server/rest/ClusterRestApi.java | 2 +-
.../apache/submarine/server/rest/EnvironmentRestApi.java | 2 +-
.../apache/submarine/server/rest/ExperimentRestApi.java | 2 +-
.../submarine/server/rest/ExperimentTemplateRestApi.java | 2 +-
.../submarine/server/rest/InternalServiceRestApi.java | 2 +-
.../apache/submarine/server/rest/ModelVersionRestApi.java | 2 +-
.../org/apache/submarine/server/rest/NotebookRestApi.java | 2 +-
.../submarine/server/rest/RegisteredModelRestApi.java | 2 +-
.../org/apache/submarine/server/rest/ServeRestApi.java | 2 +-
.../submarine/server/rest/workbench/LoginRestApi.java | 2 +-
.../submarine/server/rest/workbench/MetricRestApi.java | 2 +-
.../submarine/server/rest/workbench/ParamRestApi.java | 2 +-
.../submarine/server/rest/workbench/ProjectRestApi.java | 5 +++--
.../submarine/server/rest/workbench/SysDeptRestApi.java | 4 ++--
.../server/rest/workbench/SysDictItemRestApi.java | 4 ++--
.../submarine/server/rest/workbench/SysDictRestApi.java | 4 ++--
.../submarine/server/rest/workbench/SysUserRestApi.java | 5 +++--
.../submarine/server/rest/workbench/SystemRestApi.java | 4 ++--
.../submarine/server/rest/workbench/TeamRestApi.java | 5 +++--
.../server/{ => utils}/gson/EnvironmentIdDeserializer.java | 2 +-
.../server/{ => utils}/gson/EnvironmentIdSerializer.java | 2 +-
.../server/{ => utils}/gson/ExperimentIdDeserializer.java | 2 +-
.../server/{ => utils}/gson/ExperimentIdSerializer.java | 2 +-
.../server/{ => utils}/gson/NotebookIdDeserializer.java | 2 +-
.../server/{ => utils}/gson/NotebookIdSerializer.java | 2 +-
.../server/{ => utils}/response/DictAnnotation.java | 4 ++--
.../server/{ => utils}/response/JsonExclusionStrategy.java | 2 +-
.../server/{ => utils}/response/JsonResponse.java | 14 +++++++-------
.../submarine/server/AbstractSubmarineServerTest.java | 6 +++---
.../submarine/server/SubmarineServerClusterTest.java | 2 +-
.../submarine/server/rest/EnvironmentRestApiTest.java | 6 +++---
.../submarine/server/rest/ExperimentRestApiTest.java | 4 ++--
.../server/rest/ExperimentTemplateRestApiTest.java | 2 +-
.../submarine/server/rest/InternalServiceRestApiTest.java | 2 +-
.../submarine/server/rest/ModelVersionRestApiTest.java | 4 ++--
.../submarine/server/rest/RegisteredModelRestApiTest.java | 4 ++--
.../submarine/server/rest/workbench/CommonDataTest.java | 5 +++--
.../server/rest/workbench/SysDeptRestApiTest.java | 5 +++--
.../server/rest/workbench/SysDictItemRestApiTest.java | 5 +++--
.../server/rest/workbench/SysDictRestApiTest.java | 5 +++--
.../server/{ => utils}/response/JsonResponseTest.java | 5 +++--
.../workbench/database/utils/DictAnnotationTest.java | 5 +++--
.../apache/submarine/rest/EnvironmentManagerRestApiIT.java | 6 +++---
.../org/apache/submarine/rest/ExperimentRestApiIT.java | 10 +++++-----
.../submarine/rest/ExperimentTemplateManagerRestApiIT.java | 6 +++---
.../java/org/apache/submarine/rest/NotebookRestApiIT.java | 10 +++++-----
47 files changed, 96 insertions(+), 87 deletions(-)
diff --git
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/experimenttemplate/ExperimentTemplateManager.java
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/experimenttemplate/ExperimentTemplateManager.java
index aea2a4fd..50efa5c4 100644
---
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/experimenttemplate/ExperimentTemplateManager.java
+++
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/experimenttemplate/ExperimentTemplateManager.java
@@ -49,8 +49,8 @@ import org.apache.submarine.server.database.utils.MyBatisUtil;
import org.apache.submarine.server.experiment.ExperimentManager;
import
org.apache.submarine.server.experimenttemplate.database.entity.ExperimentTemplateEntity;
import
org.apache.submarine.server.experimenttemplate.database.mappers.ExperimentTemplateMapper;
-import org.apache.submarine.server.gson.ExperimentIdDeserializer;
-import org.apache.submarine.server.gson.ExperimentIdSerializer;
+import org.apache.submarine.server.utils.gson.ExperimentIdDeserializer;
+import org.apache.submarine.server.utils.gson.ExperimentIdSerializer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
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 d6ca97a7..b85a453b 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
@@ -23,7 +23,7 @@ import org.apache.submarine.commons.cluster.ClusterServer;
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.utils.response.JsonResponse;
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/rest/EnvironmentRestApi.java
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/EnvironmentRestApi.java
index ba56383e..f636de54 100644
---
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/EnvironmentRestApi.java
+++
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/EnvironmentRestApi.java
@@ -37,7 +37,7 @@ import
org.apache.submarine.commons.utils.exception.SubmarineRuntimeException;
import org.apache.submarine.server.api.environment.Environment;
import org.apache.submarine.server.api.spec.EnvironmentSpec;
import org.apache.submarine.server.environment.EnvironmentManager;
-import org.apache.submarine.server.response.JsonResponse;
+import org.apache.submarine.server.utils.response.JsonResponse;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
diff --git
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/ExperimentRestApi.java
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/ExperimentRestApi.java
index 16da0357..221348c3 100644
---
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/ExperimentRestApi.java
+++
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/ExperimentRestApi.java
@@ -48,8 +48,8 @@ import
org.apache.submarine.server.experimenttemplate.ExperimentTemplateManager;
import org.apache.submarine.server.api.experiment.ExperimentLog;
import
org.apache.submarine.server.api.experimenttemplate.ExperimentTemplateSubmit;
import org.apache.submarine.server.api.spec.ExperimentSpec;
-import org.apache.submarine.server.response.JsonResponse;
import org.apache.submarine.server.s3.Client;
+import org.apache.submarine.server.utils.response.JsonResponse;
/**
* Experiment Service REST API v1
diff --git
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/ExperimentTemplateRestApi.java
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/ExperimentTemplateRestApi.java
index a20c5367..22d748b6 100644
---
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/ExperimentTemplateRestApi.java
+++
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/ExperimentTemplateRestApi.java
@@ -37,7 +37,7 @@ import
org.apache.submarine.commons.utils.exception.SubmarineRuntimeException;
import org.apache.submarine.server.api.experimenttemplate.ExperimentTemplate;
import org.apache.submarine.server.api.spec.ExperimentTemplateSpec;
import
org.apache.submarine.server.experimenttemplate.ExperimentTemplateManager;
-import org.apache.submarine.server.response.JsonResponse;
+import org.apache.submarine.server.utils.response.JsonResponse;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
diff --git
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/InternalServiceRestApi.java
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/InternalServiceRestApi.java
index 07608bd3..95d28fe0 100644
---
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/InternalServiceRestApi.java
+++
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/InternalServiceRestApi.java
@@ -31,7 +31,7 @@ import javax.ws.rs.core.Response;
import org.apache.submarine.commons.utils.exception.SubmarineRuntimeException;
import org.apache.submarine.server.api.common.CustomResourceType;
import org.apache.submarine.server.internal.InternalServiceManager;
-import org.apache.submarine.server.response.JsonResponse;
+import org.apache.submarine.server.utils.response.JsonResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/ModelVersionRestApi.java
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/ModelVersionRestApi.java
index e274b877..628cae8e 100644
---
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/ModelVersionRestApi.java
+++
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/ModelVersionRestApi.java
@@ -46,8 +46,8 @@ import
org.apache.submarine.server.model.database.service.ModelVersionService;
import
org.apache.submarine.server.model.database.service.ModelVersionTagService;
-import org.apache.submarine.server.response.JsonResponse;
import org.apache.submarine.server.s3.Client;
+import org.apache.submarine.server.utils.response.JsonResponse;
/**
* Model version REST API v1.
diff --git
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/NotebookRestApi.java
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/NotebookRestApi.java
index 3e0b38de..b7af4ee6 100644
---
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/NotebookRestApi.java
+++
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/NotebookRestApi.java
@@ -28,7 +28,7 @@ import
org.apache.submarine.commons.utils.exception.SubmarineRuntimeException;
import org.apache.submarine.server.api.notebook.Notebook;
import org.apache.submarine.server.api.spec.NotebookSpec;
import org.apache.submarine.server.notebook.NotebookManager;
-import org.apache.submarine.server.response.JsonResponse;
+import org.apache.submarine.server.utils.response.JsonResponse;
import javax.ws.rs.Consumes;
import javax.ws.rs.DELETE;
diff --git
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/RegisteredModelRestApi.java
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/RegisteredModelRestApi.java
index aa540f99..002d23f5 100644
---
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/RegisteredModelRestApi.java
+++
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/RegisteredModelRestApi.java
@@ -46,8 +46,8 @@ import
org.apache.submarine.server.model.database.service.ModelVersionService;
import
org.apache.submarine.server.model.database.service.RegisteredModelService;
import
org.apache.submarine.server.model.database.service.RegisteredModelTagService;
-import org.apache.submarine.server.response.JsonResponse;
import org.apache.submarine.server.s3.Client;
+import org.apache.submarine.server.utils.response.JsonResponse;
/**
diff --git
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/ServeRestApi.java
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/ServeRestApi.java
index 4864a0d0..2c8208e4 100644
---
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/ServeRestApi.java
+++
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/ServeRestApi.java
@@ -35,7 +35,7 @@ import
org.apache.submarine.commons.utils.exception.SubmarineRuntimeException;
import org.apache.submarine.server.api.model.ServeResponse;
import org.apache.submarine.server.api.model.ServeSpec;
import org.apache.submarine.server.model.ModelManager;
-import org.apache.submarine.server.response.JsonResponse;
+import org.apache.submarine.server.utils.response.JsonResponse;
diff --git
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/LoginRestApi.java
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/LoginRestApi.java
index 00e87e08..4b474ace 100644
---
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/LoginRestApi.java
+++
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/LoginRestApi.java
@@ -25,7 +25,7 @@ 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;
-import org.apache.submarine.server.response.JsonResponse;
+import org.apache.submarine.server.utils.response.JsonResponse;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/MetricRestApi.java
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/MetricRestApi.java
index cb90849c..e0b7d4c3 100644
---
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/MetricRestApi.java
+++
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/MetricRestApi.java
@@ -18,7 +18,7 @@
*/
package org.apache.submarine.server.rest.workbench;
-import org.apache.submarine.server.response.JsonResponse;
+import org.apache.submarine.server.utils.response.JsonResponse;
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;
diff --git
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/ParamRestApi.java
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/ParamRestApi.java
index 55d34caf..5bbecdde 100644
---
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/ParamRestApi.java
+++
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/ParamRestApi.java
@@ -18,10 +18,10 @@
*/
package org.apache.submarine.server.rest.workbench;
+import org.apache.submarine.server.utils.response.JsonResponse;
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;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/ProjectRestApi.java
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/ProjectRestApi.java
index ae0d90f7..971bbf12 100644
---
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/ProjectRestApi.java
+++
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/ProjectRestApi.java
@@ -19,11 +19,12 @@
package org.apache.submarine.server.rest.workbench;
import com.github.pagehelper.PageInfo;
+
+import org.apache.submarine.server.utils.response.JsonResponse;
+import org.apache.submarine.server.utils.response.JsonResponse.ListResult;
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;
-import org.apache.submarine.server.response.JsonResponse.ListResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/SysDeptRestApi.java
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/SysDeptRestApi.java
index 46963716..ace2edf0 100644
---
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/SysDeptRestApi.java
+++
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/SysDeptRestApi.java
@@ -28,8 +28,8 @@ import
org.apache.submarine.server.workbench.database.entity.SysDeptEntity;
import org.apache.submarine.server.workbench.database.mappers.SysDeptMapper;
import org.apache.submarine.server.workbench.database.utils.DepartmentUtil;
import org.apache.submarine.server.database.utils.MyBatisUtil;
-import org.apache.submarine.server.response.JsonResponse;
-import org.apache.submarine.server.response.JsonResponse.ListResult;
+import org.apache.submarine.server.utils.response.JsonResponse;
+import org.apache.submarine.server.utils.response.JsonResponse.ListResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/SysDictItemRestApi.java
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/SysDictItemRestApi.java
index c2299ef5..4bbfbfac 100644
---
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/SysDictItemRestApi.java
+++
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/SysDictItemRestApi.java
@@ -27,8 +27,8 @@ 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;
import org.apache.submarine.server.database.utils.MyBatisUtil;
-import org.apache.submarine.server.response.JsonResponse;
-import org.apache.submarine.server.response.JsonResponse.ListResult;
+import org.apache.submarine.server.utils.response.JsonResponse;
+import org.apache.submarine.server.utils.response.JsonResponse.ListResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/SysDictRestApi.java
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/SysDictRestApi.java
index 8ff50857..4fdae27a 100644
---
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/SysDictRestApi.java
+++
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/SysDictRestApi.java
@@ -26,8 +26,8 @@ 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;
-import org.apache.submarine.server.response.JsonResponse;
-import org.apache.submarine.server.response.JsonResponse.ListResult;
+import org.apache.submarine.server.utils.response.JsonResponse;
+import org.apache.submarine.server.utils.response.JsonResponse.ListResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/SysUserRestApi.java
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/SysUserRestApi.java
index 96a9808e..f8a74bf8 100644
---
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/SysUserRestApi.java
+++
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/SysUserRestApi.java
@@ -20,6 +20,9 @@ package org.apache.submarine.server.rest.workbench;
import com.github.pagehelper.PageInfo;
import com.google.gson.Gson;
+
+import org.apache.submarine.server.utils.response.JsonResponse;
+import org.apache.submarine.server.utils.response.JsonResponse.ListResult;
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;
@@ -27,8 +30,6 @@ 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;
import org.slf4j.LoggerFactory;
diff --git
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/SystemRestApi.java
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/SystemRestApi.java
index d533c0b6..9727d1cf 100644
---
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/SystemRestApi.java
+++
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/SystemRestApi.java
@@ -26,8 +26,8 @@ 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;
import org.apache.submarine.server.database.utils.MyBatisUtil;
-import org.apache.submarine.server.response.JsonResponse;
-import org.apache.submarine.server.response.JsonResponse.ListResult;
+import org.apache.submarine.server.utils.response.JsonResponse;
+import org.apache.submarine.server.utils.response.JsonResponse.ListResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/TeamRestApi.java
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/TeamRestApi.java
index eabb06be..2f11f527 100644
---
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/TeamRestApi.java
+++
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/rest/workbench/TeamRestApi.java
@@ -19,11 +19,12 @@
package org.apache.submarine.server.rest.workbench;
import com.github.pagehelper.PageInfo;
+
+import org.apache.submarine.server.utils.response.JsonResponse;
+import org.apache.submarine.server.utils.response.JsonResponse.ListResult;
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;
-import org.apache.submarine.server.response.JsonResponse.ListResult;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/gson/EnvironmentIdDeserializer.java
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/utils/gson/EnvironmentIdDeserializer.java
similarity index 96%
rename from
submarine-server/server-core/src/main/java/org/apache/submarine/server/gson/EnvironmentIdDeserializer.java
rename to
submarine-server/server-core/src/main/java/org/apache/submarine/server/utils/gson/EnvironmentIdDeserializer.java
index 7a4d1fe4..b31ae77e 100644
---
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/gson/EnvironmentIdDeserializer.java
+++
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/utils/gson/EnvironmentIdDeserializer.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.submarine.server.gson;
+package org.apache.submarine.server.utils.gson;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer;
diff --git
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/gson/EnvironmentIdSerializer.java
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/utils/gson/EnvironmentIdSerializer.java
similarity index 96%
rename from
submarine-server/server-core/src/main/java/org/apache/submarine/server/gson/EnvironmentIdSerializer.java
rename to
submarine-server/server-core/src/main/java/org/apache/submarine/server/utils/gson/EnvironmentIdSerializer.java
index 92cccb39..929dafc9 100644
---
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/gson/EnvironmentIdSerializer.java
+++
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/utils/gson/EnvironmentIdSerializer.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.submarine.server.gson;
+package org.apache.submarine.server.utils.gson;
import com.google.gson.JsonElement;
import com.google.gson.JsonPrimitive;
diff --git
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/gson/ExperimentIdDeserializer.java
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/utils/gson/ExperimentIdDeserializer.java
similarity index 96%
rename from
submarine-server/server-core/src/main/java/org/apache/submarine/server/gson/ExperimentIdDeserializer.java
rename to
submarine-server/server-core/src/main/java/org/apache/submarine/server/utils/gson/ExperimentIdDeserializer.java
index 1b7718e6..099bf117 100644
---
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/gson/ExperimentIdDeserializer.java
+++
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/utils/gson/ExperimentIdDeserializer.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.submarine.server.gson;
+package org.apache.submarine.server.utils.gson;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer;
diff --git
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/gson/ExperimentIdSerializer.java
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/utils/gson/ExperimentIdSerializer.java
similarity index 96%
rename from
submarine-server/server-core/src/main/java/org/apache/submarine/server/gson/ExperimentIdSerializer.java
rename to
submarine-server/server-core/src/main/java/org/apache/submarine/server/utils/gson/ExperimentIdSerializer.java
index aad068b6..a29412fe 100644
---
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/gson/ExperimentIdSerializer.java
+++
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/utils/gson/ExperimentIdSerializer.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.submarine.server.gson;
+package org.apache.submarine.server.utils.gson;
import com.google.gson.JsonElement;
import com.google.gson.JsonPrimitive;
diff --git
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/gson/NotebookIdDeserializer.java
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/utils/gson/NotebookIdDeserializer.java
similarity index 96%
rename from
submarine-server/server-core/src/main/java/org/apache/submarine/server/gson/NotebookIdDeserializer.java
rename to
submarine-server/server-core/src/main/java/org/apache/submarine/server/utils/gson/NotebookIdDeserializer.java
index df3a8c95..f66143dd 100644
---
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/gson/NotebookIdDeserializer.java
+++
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/utils/gson/NotebookIdDeserializer.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.submarine.server.gson;
+package org.apache.submarine.server.utils.gson;
import com.google.gson.JsonDeserializationContext;
import com.google.gson.JsonDeserializer;
diff --git
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/gson/NotebookIdSerializer.java
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/utils/gson/NotebookIdSerializer.java
similarity index 96%
rename from
submarine-server/server-core/src/main/java/org/apache/submarine/server/gson/NotebookIdSerializer.java
rename to
submarine-server/server-core/src/main/java/org/apache/submarine/server/utils/gson/NotebookIdSerializer.java
index f5baeb64..ec48e537 100644
---
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/gson/NotebookIdSerializer.java
+++
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/utils/gson/NotebookIdSerializer.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.submarine.server.gson;
+package org.apache.submarine.server.utils.gson;
import com.google.gson.JsonElement;
import com.google.gson.JsonPrimitive;
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/utils/response/DictAnnotation.java
similarity index 98%
rename from
submarine-server/server-core/src/main/java/org/apache/submarine/server/response/DictAnnotation.java
rename to
submarine-server/server-core/src/main/java/org/apache/submarine/server/utils/response/DictAnnotation.java
index 27270e6c..07d0a29d 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/utils/response/DictAnnotation.java
@@ -16,12 +16,12 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.submarine.server.response;
+package org.apache.submarine.server.utils.response;
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.utils.response.JsonResponse.ListResult;
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;
diff --git
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/response/JsonExclusionStrategy.java
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/utils/response/JsonExclusionStrategy.java
similarity index 95%
rename from
submarine-server/server-core/src/main/java/org/apache/submarine/server/response/JsonExclusionStrategy.java
rename to
submarine-server/server-core/src/main/java/org/apache/submarine/server/utils/response/JsonExclusionStrategy.java
index ba62662b..ccc9a22c 100644
---
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/response/JsonExclusionStrategy.java
+++
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/utils/response/JsonExclusionStrategy.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.submarine.server.response;
+package org.apache.submarine.server.utils.response;
import com.google.gson.ExclusionStrategy;
import com.google.gson.FieldAttributes;
diff --git
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/response/JsonResponse.java
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/utils/response/JsonResponse.java
similarity index 93%
rename from
submarine-server/server-core/src/main/java/org/apache/submarine/server/response/JsonResponse.java
rename to
submarine-server/server-core/src/main/java/org/apache/submarine/server/utils/response/JsonResponse.java
index b03cc26d..48f15c15 100644
---
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/response/JsonResponse.java
+++
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/utils/response/JsonResponse.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.submarine.server.response;
+package org.apache.submarine.server.utils.response;
import com.google.common.annotations.VisibleForTesting;
import com.google.gson.Gson;
@@ -25,13 +25,13 @@ import com.google.gson.GsonBuilder;
import com.google.gson.TypeAdapter;
import org.apache.submarine.server.api.environment.EnvironmentId;
import org.apache.submarine.server.api.experiment.ExperimentId;
-import org.apache.submarine.server.gson.EnvironmentIdDeserializer;
-import org.apache.submarine.server.gson.EnvironmentIdSerializer;
import org.apache.submarine.server.api.notebook.NotebookId;
-import org.apache.submarine.server.gson.ExperimentIdDeserializer;
-import org.apache.submarine.server.gson.ExperimentIdSerializer;
-import org.apache.submarine.server.gson.NotebookIdDeserializer;
-import org.apache.submarine.server.gson.NotebookIdSerializer;
+import org.apache.submarine.server.utils.gson.EnvironmentIdDeserializer;
+import org.apache.submarine.server.utils.gson.EnvironmentIdSerializer;
+import org.apache.submarine.server.utils.gson.ExperimentIdDeserializer;
+import org.apache.submarine.server.utils.gson.ExperimentIdSerializer;
+import org.apache.submarine.server.utils.gson.NotebookIdDeserializer;
+import org.apache.submarine.server.utils.gson.NotebookIdSerializer;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/submarine-server/server-core/src/test/java/org/apache/submarine/server/AbstractSubmarineServerTest.java
b/submarine-server/server-core/src/test/java/org/apache/submarine/server/AbstractSubmarineServerTest.java
index 455db2ea..7cd4fe51 100644
---
a/submarine-server/server-core/src/test/java/org/apache/submarine/server/AbstractSubmarineServerTest.java
+++
b/submarine-server/server-core/src/test/java/org/apache/submarine/server/AbstractSubmarineServerTest.java
@@ -54,11 +54,11 @@ import org.apache.http.util.EntityUtils;
import org.apache.submarine.commons.utils.SubmarineConfVars;
import org.apache.submarine.server.api.environment.Environment;
import org.apache.submarine.server.api.environment.EnvironmentId;
-import org.apache.submarine.server.gson.EnvironmentIdDeserializer;
-import org.apache.submarine.server.gson.EnvironmentIdSerializer;
-import org.apache.submarine.server.response.JsonResponse;
import org.apache.submarine.server.rest.RestConstants;
import org.apache.submarine.server.utils.TestUtils;
+import org.apache.submarine.server.utils.gson.EnvironmentIdDeserializer;
+import org.apache.submarine.server.utils.gson.EnvironmentIdSerializer;
+import org.apache.submarine.server.utils.response.JsonResponse;
import org.hamcrest.Description;
import org.hamcrest.TypeSafeMatcher;
import org.junit.Assert;
diff --git
a/submarine-server/server-core/src/test/java/org/apache/submarine/server/SubmarineServerClusterTest.java
b/submarine-server/server-core/src/test/java/org/apache/submarine/server/SubmarineServerClusterTest.java
index 6c1a65d4..d55258d9 100644
---
a/submarine-server/server-core/src/test/java/org/apache/submarine/server/SubmarineServerClusterTest.java
+++
b/submarine-server/server-core/src/test/java/org/apache/submarine/server/SubmarineServerClusterTest.java
@@ -27,8 +27,8 @@ import org.apache.submarine.commons.cluster.meta.ClusterMeta;
import org.apache.submarine.commons.cluster.meta.ClusterMetaType;
import org.apache.submarine.commons.utils.NetworkUtils;
import org.apache.submarine.commons.utils.SubmarineConfiguration;
-import org.apache.submarine.server.response.JsonResponse;
import org.apache.submarine.server.rest.RestConstants;
+import org.apache.submarine.server.utils.response.JsonResponse;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Ignore;
diff --git
a/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/EnvironmentRestApiTest.java
b/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/EnvironmentRestApiTest.java
index 6688c0e9..04da419d 100644
---
a/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/EnvironmentRestApiTest.java
+++
b/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/EnvironmentRestApiTest.java
@@ -27,9 +27,9 @@ import
org.apache.submarine.server.api.environment.Environment;
import org.apache.submarine.server.api.environment.EnvironmentId;
import org.apache.submarine.server.api.spec.EnvironmentSpec;
import org.apache.submarine.server.api.spec.KernelSpec;
-import org.apache.submarine.server.gson.EnvironmentIdDeserializer;
-import org.apache.submarine.server.gson.EnvironmentIdSerializer;
-import org.apache.submarine.server.response.JsonResponse;
+import org.apache.submarine.server.utils.gson.EnvironmentIdDeserializer;
+import org.apache.submarine.server.utils.gson.EnvironmentIdSerializer;
+import org.apache.submarine.server.utils.response.JsonResponse;
import org.junit.After;
import org.junit.Before;
import org.junit.BeforeClass;
diff --git
a/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/ExperimentRestApiTest.java
b/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/ExperimentRestApiTest.java
index 7a537615..a8ba16e7 100644
---
a/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/ExperimentRestApiTest.java
+++
b/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/ExperimentRestApiTest.java
@@ -33,8 +33,8 @@ import org.apache.submarine.server.api.spec.ExperimentMeta;
import org.apache.submarine.server.api.spec.ExperimentSpec;
import org.apache.submarine.server.api.spec.KernelSpec;
import org.apache.submarine.server.experiment.ExperimentManager;
-import org.apache.submarine.server.gson.ExperimentIdDeserializer;
-import org.apache.submarine.server.gson.ExperimentIdSerializer;
+import org.apache.submarine.server.utils.gson.ExperimentIdDeserializer;
+import org.apache.submarine.server.utils.gson.ExperimentIdSerializer;
import org.junit.Ignore;
import org.junit.Test;
import org.junit.BeforeClass;
diff --git
a/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/ExperimentTemplateRestApiTest.java
b/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/ExperimentTemplateRestApiTest.java
index fff59e06..34677290 100644
---
a/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/ExperimentTemplateRestApiTest.java
+++
b/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/ExperimentTemplateRestApiTest.java
@@ -25,7 +25,7 @@ import com.google.gson.reflect.TypeToken;
import org.apache.submarine.commons.utils.SubmarineConfiguration;
import org.apache.submarine.server.api.experimenttemplate.ExperimentTemplate;
import org.apache.submarine.server.api.spec.ExperimentTemplateSpec;
-import org.apache.submarine.server.response.JsonResponse;
+import org.apache.submarine.server.utils.response.JsonResponse;
import org.junit.After;
import org.junit.Assert;
import org.junit.Before;
diff --git
a/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/InternalServiceRestApiTest.java
b/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/InternalServiceRestApiTest.java
index c58374dc..d3e46993 100644
---
a/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/InternalServiceRestApiTest.java
+++
b/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/InternalServiceRestApiTest.java
@@ -31,7 +31,7 @@ import javax.ws.rs.core.Response;
import org.apache.submarine.server.api.common.CustomResourceType;
import org.apache.submarine.server.internal.InternalServiceManager;
-import org.apache.submarine.server.response.JsonResponse;
+import org.apache.submarine.server.utils.response.JsonResponse;
import org.junit.Before;
import org.junit.Test;
diff --git
a/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/ModelVersionRestApiTest.java
b/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/ModelVersionRestApiTest.java
index 89b16a05..9b7793a7 100644
---
a/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/ModelVersionRestApiTest.java
+++
b/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/ModelVersionRestApiTest.java
@@ -34,12 +34,12 @@ import java.util.ArrayList;
import java.util.List;
import javax.ws.rs.core.Response;
import org.apache.submarine.server.api.experiment.ExperimentId;
-import org.apache.submarine.server.gson.ExperimentIdDeserializer;
-import org.apache.submarine.server.gson.ExperimentIdSerializer;
import org.apache.submarine.server.model.database.entities.ModelVersionEntity;
import
org.apache.submarine.server.model.database.entities.RegisteredModelEntity;
import org.apache.submarine.server.model.database.service.ModelVersionService;
import
org.apache.submarine.server.model.database.service.RegisteredModelService;
+import org.apache.submarine.server.utils.gson.ExperimentIdDeserializer;
+import org.apache.submarine.server.utils.gson.ExperimentIdSerializer;
public class ModelVersionRestApiTest {
diff --git
a/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/RegisteredModelRestApiTest.java
b/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/RegisteredModelRestApiTest.java
index a6cee07b..4b2d0cf7 100644
---
a/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/RegisteredModelRestApiTest.java
+++
b/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/RegisteredModelRestApiTest.java
@@ -33,10 +33,10 @@ import java.util.ArrayList;
import java.util.List;
import javax.ws.rs.core.Response;
import org.apache.submarine.server.api.experiment.ExperimentId;
-import org.apache.submarine.server.gson.ExperimentIdDeserializer;
-import org.apache.submarine.server.gson.ExperimentIdSerializer;
import
org.apache.submarine.server.model.database.entities.RegisteredModelEntity;
import
org.apache.submarine.server.model.database.service.RegisteredModelService;
+import org.apache.submarine.server.utils.gson.ExperimentIdDeserializer;
+import org.apache.submarine.server.utils.gson.ExperimentIdSerializer;
public class RegisteredModelRestApiTest {
private final RegisteredModelService registeredModelService = new
RegisteredModelService();
diff --git
a/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/workbench/CommonDataTest.java
b/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/workbench/CommonDataTest.java
index a29e3aed..f223b0eb 100644
---
a/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/workbench/CommonDataTest.java
+++
b/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/workbench/CommonDataTest.java
@@ -21,14 +21,15 @@ package org.apache.submarine.server.rest.workbench;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
+
+import org.apache.submarine.server.utils.response.JsonResponse;
+import org.apache.submarine.server.utils.response.JsonResponse.ListResult;
import org.apache.submarine.server.workbench.database.entity.SysDeptEntity;
import org.apache.submarine.server.workbench.database.entity.SysDeptTree;
import org.apache.submarine.server.workbench.database.entity.SysDictEntity;
import org.apache.submarine.server.workbench.database.entity.SysDictItemEntity;
import org.apache.submarine.server.workbench.database.entity.SysUserEntity;
import org.apache.submarine.server.workbench.database.service.SysUserService;
-import org.apache.submarine.server.response.JsonResponse;
-import org.apache.submarine.server.response.JsonResponse.ListResult;
import org.junit.AfterClass;
import org.junit.Assert;
import org.junit.BeforeClass;
diff --git
a/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/workbench/SysDeptRestApiTest.java
b/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/workbench/SysDeptRestApiTest.java
index 98c5bcab..f15d7f30 100644
---
a/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/workbench/SysDeptRestApiTest.java
+++
b/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/workbench/SysDeptRestApiTest.java
@@ -20,10 +20,11 @@ package org.apache.submarine.server.rest.workbench;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
+
+import org.apache.submarine.server.utils.response.JsonResponse;
+import org.apache.submarine.server.utils.response.JsonResponse.ListResult;
import org.apache.submarine.server.workbench.database.entity.SysDeptEntity;
import org.apache.submarine.server.workbench.database.entity.SysDeptTree;
-import org.apache.submarine.server.response.JsonResponse;
-import org.apache.submarine.server.response.JsonResponse.ListResult;
import org.junit.After;
import org.junit.Test;
diff --git
a/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/workbench/SysDictItemRestApiTest.java
b/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/workbench/SysDictItemRestApiTest.java
index e5947021..76313773 100644
---
a/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/workbench/SysDictItemRestApiTest.java
+++
b/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/workbench/SysDictItemRestApiTest.java
@@ -21,10 +21,11 @@ package org.apache.submarine.server.rest.workbench;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
+
+import org.apache.submarine.server.utils.response.JsonResponse;
+import org.apache.submarine.server.utils.response.JsonResponse.ListResult;
import org.apache.submarine.server.workbench.database.entity.SysDictEntity;
import org.apache.submarine.server.workbench.database.entity.SysDictItemEntity;
-import org.apache.submarine.server.response.JsonResponse;
-import org.apache.submarine.server.response.JsonResponse.ListResult;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git
a/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/workbench/SysDictRestApiTest.java
b/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/workbench/SysDictRestApiTest.java
index 8483b7bd..60bc75e5 100644
---
a/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/workbench/SysDictRestApiTest.java
+++
b/submarine-server/server-core/src/test/java/org/apache/submarine/server/rest/workbench/SysDictRestApiTest.java
@@ -21,9 +21,10 @@ package org.apache.submarine.server.rest.workbench;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
import com.google.gson.reflect.TypeToken;
+
+import org.apache.submarine.server.utils.response.JsonResponse;
+import org.apache.submarine.server.utils.response.JsonResponse.ListResult;
import org.apache.submarine.server.workbench.database.entity.SysDictEntity;
-import org.apache.submarine.server.response.JsonResponse;
-import org.apache.submarine.server.response.JsonResponse.ListResult;
import org.junit.AfterClass;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git
a/submarine-server/server-core/src/test/java/org/apache/submarine/server/response/JsonResponseTest.java
b/submarine-server/server-core/src/test/java/org/apache/submarine/server/utils/response/JsonResponseTest.java
similarity index 96%
rename from
submarine-server/server-core/src/test/java/org/apache/submarine/server/response/JsonResponseTest.java
rename to
submarine-server/server-core/src/test/java/org/apache/submarine/server/utils/response/JsonResponseTest.java
index e17a74a6..3f20ddcc 100644
---
a/submarine-server/server-core/src/test/java/org/apache/submarine/server/response/JsonResponseTest.java
+++
b/submarine-server/server-core/src/test/java/org/apache/submarine/server/utils/response/JsonResponseTest.java
@@ -15,13 +15,14 @@
* limitations under the License.
*/
-package org.apache.submarine.server.response;
+package org.apache.submarine.server.utils.response;
import com.google.common.reflect.TypeToken;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
+
+import org.apache.submarine.server.utils.response.JsonResponse.ListResult;
import org.apache.submarine.server.workbench.database.entity.SysDictEntity;
-import org.apache.submarine.server.response.JsonResponse.ListResult;
import org.junit.Test;
import javax.ws.rs.core.Response;
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 4628e5ab..136bd00a 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
@@ -22,8 +22,9 @@ import com.google.gson.Gson;
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.response.JsonResponse;
+
+import org.apache.submarine.server.utils.response.DictAnnotation;
+import org.apache.submarine.server.utils.response.JsonResponse;
import org.apache.submarine.server.rest.workbench.CommonDataTest;
import org.apache.submarine.server.rest.workbench.SysUserRestApi;
import org.junit.Test;
diff --git
a/submarine-test/test-k8s/src/test/java/org/apache/submarine/rest/EnvironmentManagerRestApiIT.java
b/submarine-test/test-k8s/src/test/java/org/apache/submarine/rest/EnvironmentManagerRestApiIT.java
index d394d98e..049741fb 100644
---
a/submarine-test/test-k8s/src/test/java/org/apache/submarine/rest/EnvironmentManagerRestApiIT.java
+++
b/submarine-test/test-k8s/src/test/java/org/apache/submarine/rest/EnvironmentManagerRestApiIT.java
@@ -27,9 +27,9 @@ import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.submarine.server.AbstractSubmarineServerTest;
import org.apache.submarine.server.api.environment.Environment;
import org.apache.submarine.server.api.environment.EnvironmentId;
-import org.apache.submarine.server.gson.EnvironmentIdDeserializer;
-import org.apache.submarine.server.gson.EnvironmentIdSerializer;
-import org.apache.submarine.server.response.JsonResponse;
+import org.apache.submarine.server.utils.gson.EnvironmentIdDeserializer;
+import org.apache.submarine.server.utils.gson.EnvironmentIdSerializer;
+import org.apache.submarine.server.utils.response.JsonResponse;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git
a/submarine-test/test-k8s/src/test/java/org/apache/submarine/rest/ExperimentRestApiIT.java
b/submarine-test/test-k8s/src/test/java/org/apache/submarine/rest/ExperimentRestApiIT.java
index e9aa2307..29d761dc 100644
---
a/submarine-test/test-k8s/src/test/java/org/apache/submarine/rest/ExperimentRestApiIT.java
+++
b/submarine-test/test-k8s/src/test/java/org/apache/submarine/rest/ExperimentRestApiIT.java
@@ -37,13 +37,13 @@ import
org.apache.submarine.server.AbstractSubmarineServerTest;
import org.apache.submarine.server.api.environment.EnvironmentId;
import org.apache.submarine.server.api.experiment.Experiment;
import org.apache.submarine.server.api.experiment.ExperimentId;
-import org.apache.submarine.server.gson.EnvironmentIdDeserializer;
-import org.apache.submarine.server.gson.EnvironmentIdSerializer;
-import org.apache.submarine.server.gson.ExperimentIdDeserializer;
-import org.apache.submarine.server.gson.ExperimentIdSerializer;
import org.apache.submarine.server.api.environment.Environment;
-import org.apache.submarine.server.response.JsonResponse;
import org.apache.submarine.server.rest.RestConstants;
+import org.apache.submarine.server.utils.gson.EnvironmentIdDeserializer;
+import org.apache.submarine.server.utils.gson.EnvironmentIdSerializer;
+import org.apache.submarine.server.utils.gson.ExperimentIdDeserializer;
+import org.apache.submarine.server.utils.gson.ExperimentIdSerializer;
+import org.apache.submarine.server.utils.response.JsonResponse;
import org.joda.time.DateTime;
import org.junit.Assert;
import org.junit.Before;
diff --git
a/submarine-test/test-k8s/src/test/java/org/apache/submarine/rest/ExperimentTemplateManagerRestApiIT.java
b/submarine-test/test-k8s/src/test/java/org/apache/submarine/rest/ExperimentTemplateManagerRestApiIT.java
index acf3383a..82984230 100644
---
a/submarine-test/test-k8s/src/test/java/org/apache/submarine/rest/ExperimentTemplateManagerRestApiIT.java
+++
b/submarine-test/test-k8s/src/test/java/org/apache/submarine/rest/ExperimentTemplateManagerRestApiIT.java
@@ -34,10 +34,10 @@ import
org.apache.submarine.server.api.experimenttemplate.ExperimentTemplate;
import
org.apache.submarine.server.api.experimenttemplate.ExperimentTemplateSubmit;
import org.apache.submarine.server.api.spec.ExperimentSpec;
import org.apache.submarine.server.api.spec.ExperimentTemplateSpec;
-import org.apache.submarine.server.gson.ExperimentIdDeserializer;
-import org.apache.submarine.server.gson.ExperimentIdSerializer;
-import org.apache.submarine.server.response.JsonResponse;
import org.apache.submarine.server.rest.RestConstants;
+import org.apache.submarine.server.utils.gson.ExperimentIdDeserializer;
+import org.apache.submarine.server.utils.gson.ExperimentIdSerializer;
+import org.apache.submarine.server.utils.response.JsonResponse;
import org.junit.Assert;
import org.junit.BeforeClass;
import org.junit.Test;
diff --git
a/submarine-test/test-k8s/src/test/java/org/apache/submarine/rest/NotebookRestApiIT.java
b/submarine-test/test-k8s/src/test/java/org/apache/submarine/rest/NotebookRestApiIT.java
index 2f882050..2716f2e5 100644
---
a/submarine-test/test-k8s/src/test/java/org/apache/submarine/rest/NotebookRestApiIT.java
+++
b/submarine-test/test-k8s/src/test/java/org/apache/submarine/rest/NotebookRestApiIT.java
@@ -39,12 +39,12 @@ import
org.apache.submarine.server.api.environment.Environment;
import org.apache.submarine.server.api.environment.EnvironmentId;
import org.apache.submarine.server.api.notebook.Notebook;
import org.apache.submarine.server.api.notebook.NotebookId;
-import org.apache.submarine.server.gson.EnvironmentIdDeserializer;
-import org.apache.submarine.server.gson.EnvironmentIdSerializer;
-import org.apache.submarine.server.gson.NotebookIdDeserializer;
-import org.apache.submarine.server.gson.NotebookIdSerializer;
-import org.apache.submarine.server.response.JsonResponse;
import org.apache.submarine.server.rest.RestConstants;
+import org.apache.submarine.server.utils.gson.EnvironmentIdDeserializer;
+import org.apache.submarine.server.utils.gson.EnvironmentIdSerializer;
+import org.apache.submarine.server.utils.gson.NotebookIdDeserializer;
+import org.apache.submarine.server.utils.gson.NotebookIdSerializer;
+import org.apache.submarine.server.utils.response.JsonResponse;
import org.joda.time.DateTime;
import org.junit.Assert;
import org.junit.BeforeClass;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
