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 fca5f7f SUBMARINE-1030. Refactor database service directories and
class name
fca5f7f is described below
commit fca5f7ffb6e6e639f62ad9251b0bed5ab9dc5e0c
Author: kobe860219 <[email protected]>
AuthorDate: Wed Sep 29 01:09:10 2021 +0800
SUBMARINE-1030. Refactor database service directories and class name
### What is this PR for?
In order to unify the development style. Refactor database service
directories and class name.
### What type of PR is it?
[Refactoring]
### Todos
* [ ] - Rename class name
### What is the Jira issue?
https://issues.apache.org/jira/browse/SUBMARINE-1030
### How should this be tested?
https://github.com/apache/submarine/pull/759/checks?check_run_id=3719916889
### Screenshots (if appropriate)
### Questions:
* Do the license files need updating? No
* Are there breaking changes for older versions? No
* Does this need new documentation? No
Author: kobe860219 <[email protected]>
Signed-off-by: Kevin <[email protected]>
Closes #759 from kobe860219/SUBMARINE-1030 and squashes the following
commits:
eb312ce0 [kobe860219] Remove files automatically generated by IDE
f6fc7cc6 [kobe860219] Refactor directories
---
.../server/environment/database/entity/EnvironmentEntity.java | 2 +-
.../org/apache/submarine/server/experiment/ExperimentManager.java | 4 ++--
.../server/experiment/database/{ => entity}/ExperimentEntity.java | 2 +-
.../experiment/database/{ => mappers}/ExperimentMapper.java | 4 +++-
.../experiment/database/{ => service}/ExperimentService.java | 4 +++-
.../server/model/database/{ => service}/ModelService.java | 4 ++--
.../org/apache/submarine/server/notebook/NotebookManager.java | 2 +-
.../server/notebook/database/{ => entity}/NotebookEntity.java | 2 +-
.../server/notebook/database/{ => mappers}/NotebookMapper.java | 4 +++-
.../server/notebook/database/{ => service}/NotebookService.java | 4 +++-
.../org/apache/submarine/database/mappers/ExperimentMapper.xml | 8 ++++----
.../org/apache/submarine/database/mappers/NotebookMapper.xml | 8 ++++----
.../apache/submarine/server/experiment/ExperimentManagerTest.java | 4 ++--
.../server/experiment/database/ExperimentServiceTest.java | 2 ++
.../server/workbench/database/service/MetricServiceTest.java | 4 ++--
.../server/workbench/database/service/ParamServiceTest.java | 4 ++--
16 files changed, 36 insertions(+), 26 deletions(-)
diff --git
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/environment/database/entity/EnvironmentEntity.java
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/environment/database/entity/EnvironmentEntity.java
index 4ea903d..78d3ed0 100644
---
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/environment/database/entity/EnvironmentEntity.java
+++
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/environment/database/entity/EnvironmentEntity.java
@@ -41,5 +41,5 @@ public class EnvironmentEntity extends BaseEntity {
public void setEnvironmentSpec(String environmentSpec) {
this.environmentSpec = environmentSpec;
}
-
+
}
diff --git
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/experiment/ExperimentManager.java
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/experiment/ExperimentManager.java
index edddbb3..cb55a25 100644
---
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/experiment/ExperimentManager.java
+++
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/experiment/ExperimentManager.java
@@ -44,8 +44,8 @@ import org.apache.submarine.server.api.experiment.MlflowInfo;
import org.apache.submarine.server.api.experiment.ServeRequest;
import org.apache.submarine.server.api.experiment.ServeResponse;
import org.apache.submarine.server.api.spec.ExperimentSpec;
-import org.apache.submarine.server.experiment.database.ExperimentEntity;
-import org.apache.submarine.server.experiment.database.ExperimentService;
+import org.apache.submarine.server.experiment.database.entity.ExperimentEntity;
+import
org.apache.submarine.server.experiment.database.service.ExperimentService;
import org.apache.submarine.server.rest.RestConstants;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/experiment/database/ExperimentEntity.java
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/experiment/database/entity/ExperimentEntity.java
similarity index 96%
rename from
submarine-server/server-core/src/main/java/org/apache/submarine/server/experiment/database/ExperimentEntity.java
rename to
submarine-server/server-core/src/main/java/org/apache/submarine/server/experiment/database/entity/ExperimentEntity.java
index ef83de0..560413d 100644
---
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/experiment/database/ExperimentEntity.java
+++
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/experiment/database/entity/ExperimentEntity.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.submarine.server.experiment.database;
+package org.apache.submarine.server.experiment.database.entity;
import org.apache.submarine.server.database.entity.BaseEntity;
diff --git
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/experiment/database/ExperimentMapper.java
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/experiment/database/mappers/ExperimentMapper.java
similarity index 87%
rename from
submarine-server/server-core/src/main/java/org/apache/submarine/server/experiment/database/ExperimentMapper.java
rename to
submarine-server/server-core/src/main/java/org/apache/submarine/server/experiment/database/mappers/ExperimentMapper.java
index 386a48e..edefabb 100644
---
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/experiment/database/ExperimentMapper.java
+++
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/experiment/database/mappers/ExperimentMapper.java
@@ -17,7 +17,9 @@
* under the License.
*/
-package org.apache.submarine.server.experiment.database;
+package org.apache.submarine.server.experiment.database.mappers;
+
+import org.apache.submarine.server.experiment.database.entity.ExperimentEntity;
import java.util.List;
diff --git
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/experiment/database/ExperimentService.java
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/experiment/database/service/ExperimentService.java
similarity index 94%
rename from
submarine-server/server-core/src/main/java/org/apache/submarine/server/experiment/database/ExperimentService.java
rename to
submarine-server/server-core/src/main/java/org/apache/submarine/server/experiment/database/service/ExperimentService.java
index c23bbfa..b60eca8 100644
---
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/experiment/database/ExperimentService.java
+++
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/experiment/database/service/ExperimentService.java
@@ -17,11 +17,13 @@
* under the License.
*/
-package org.apache.submarine.server.experiment.database;
+package org.apache.submarine.server.experiment.database.service;
import org.apache.ibatis.session.SqlSession;
import org.apache.submarine.commons.utils.exception.SubmarineRuntimeException;
import org.apache.submarine.server.database.utils.MyBatisUtil;
+import org.apache.submarine.server.experiment.database.entity.ExperimentEntity;
+import
org.apache.submarine.server.experiment.database.mappers.ExperimentMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/model/database/ModelService.java
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/model/database/service/ModelService.java
similarity index 98%
rename from
submarine-server/server-core/src/main/java/org/apache/submarine/server/model/database/ModelService.java
rename to
submarine-server/server-core/src/main/java/org/apache/submarine/server/model/database/service/ModelService.java
index e524318..b0bb750 100644
---
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/model/database/ModelService.java
+++
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/model/database/service/ModelService.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.submarine.server.model.database;
+package org.apache.submarine.server.model.database.service;
import org.apache.ibatis.session.SqlSession;
import org.slf4j.Logger;
@@ -33,7 +33,7 @@ import
org.apache.submarine.server.model.database.mappers.ModelVersionMapper;
public class ModelService {
private static final Logger
- LOG =
LoggerFactory.getLogger(org.apache.submarine.server.model.database.ModelService.class);
+ LOG = LoggerFactory.getLogger(ModelService.class);
public List<RegisteredModelNameEntity> selectAllRegisteredModelName() throws
SubmarineRuntimeException {
LOG.info("Registered Model Name selectAll");
diff --git
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/notebook/NotebookManager.java
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/notebook/NotebookManager.java
index 43c848b..a39320c 100644
---
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/notebook/NotebookManager.java
+++
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/notebook/NotebookManager.java
@@ -35,7 +35,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Map;
import java.util.concurrent.atomic.AtomicInteger;
-import org.apache.submarine.server.notebook.database.NotebookService;
+import org.apache.submarine.server.notebook.database.service.NotebookService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/notebook/database/NotebookEntity.java
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/notebook/database/entity/NotebookEntity.java
similarity index 96%
rename from
submarine-server/server-core/src/main/java/org/apache/submarine/server/notebook/database/NotebookEntity.java
rename to
submarine-server/server-core/src/main/java/org/apache/submarine/server/notebook/database/entity/NotebookEntity.java
index 0da59ae..21cebd9 100644
---
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/notebook/database/NotebookEntity.java
+++
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/notebook/database/entity/NotebookEntity.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.submarine.server.notebook.database;
+package org.apache.submarine.server.notebook.database.entity;
import org.apache.submarine.server.database.entity.BaseEntity;
diff --git
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/notebook/database/NotebookMapper.java
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/notebook/database/mappers/NotebookMapper.java
similarity index 88%
rename from
submarine-server/server-core/src/main/java/org/apache/submarine/server/notebook/database/NotebookMapper.java
rename to
submarine-server/server-core/src/main/java/org/apache/submarine/server/notebook/database/mappers/NotebookMapper.java
index eded0c1..f29936a 100644
---
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/notebook/database/NotebookMapper.java
+++
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/notebook/database/mappers/NotebookMapper.java
@@ -17,7 +17,9 @@
* under the License.
*/
-package org.apache.submarine.server.notebook.database;
+package org.apache.submarine.server.notebook.database.mappers;
+
+import org.apache.submarine.server.notebook.database.entity.NotebookEntity;
import java.util.List;
diff --git
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/notebook/database/NotebookService.java
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/notebook/database/service/NotebookService.java
similarity index 96%
rename from
submarine-server/server-core/src/main/java/org/apache/submarine/server/notebook/database/NotebookService.java
rename to
submarine-server/server-core/src/main/java/org/apache/submarine/server/notebook/database/service/NotebookService.java
index 839ca0e..704cb2c 100644
---
a/submarine-server/server-core/src/main/java/org/apache/submarine/server/notebook/database/NotebookService.java
+++
b/submarine-server/server-core/src/main/java/org/apache/submarine/server/notebook/database/service/NotebookService.java
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.submarine.server.notebook.database;
+package org.apache.submarine.server.notebook.database.service;
import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
@@ -28,6 +28,8 @@ import org.apache.submarine.server.api.notebook.Notebook;
import org.apache.submarine.server.api.notebook.NotebookId;
import org.apache.submarine.server.api.spec.NotebookSpec;
import org.apache.submarine.server.database.utils.MyBatisUtil;
+import org.apache.submarine.server.notebook.database.entity.NotebookEntity;
+import org.apache.submarine.server.notebook.database.mappers.NotebookMapper;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git
a/submarine-server/server-core/src/main/resources/org/apache/submarine/database/mappers/ExperimentMapper.xml
b/submarine-server/server-core/src/main/resources/org/apache/submarine/database/mappers/ExperimentMapper.xml
index 4842da2..a5ae801 100644
---
a/submarine-server/server-core/src/main/resources/org/apache/submarine/database/mappers/ExperimentMapper.xml
+++
b/submarine-server/server-core/src/main/resources/org/apache/submarine/database/mappers/ExperimentMapper.xml
@@ -18,7 +18,7 @@
under the License.
-->
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd";>
-<mapper
namespace="org.apache.submarine.server.experiment.database.ExperimentMapper">
+<mapper
namespace="org.apache.submarine.server.experiment.database.mappers.ExperimentMapper">
<resultMap id="BaseEntityResultMap"
type="org.apache.submarine.server.database.entity.BaseEntity">
<id property="id" column="id"/>
<result column="create_by" property="createBy"/>
@@ -27,7 +27,7 @@
<result column="update_time" property="updateTime"/>
</resultMap>
- <resultMap id="ExperimentEntityResultMap"
type="org.apache.submarine.server.experiment.database.ExperimentEntity"
extends="BaseEntityResultMap">
+ <resultMap id="ExperimentEntityResultMap"
type="org.apache.submarine.server.experiment.database.entity.ExperimentEntity"
extends="BaseEntityResultMap">
<result column="experiment_spec" jdbcType="VARCHAR"
property="experimentSpec" />
</resultMap>
@@ -53,13 +53,13 @@
where id = #{id,jdbcType=VARCHAR}
</delete>
- <insert id="insert"
parameterType="org.apache.submarine.server.experiment.database.ExperimentEntity">
+ <insert id="insert"
parameterType="org.apache.submarine.server.experiment.database.entity.ExperimentEntity">
insert into experiment (id, experiment_spec, create_by, create_time,
update_by, update_time)
values (#{id,jdbcType=VARCHAR}, #{experimentSpec,jdbcType=VARCHAR},
#{createBy,jdbcType=VARCHAR}, now(), #{updateBy,jdbcType=VARCHAR},
now())
</insert>
- <update id="update"
parameterType="org.apache.submarine.server.experiment.database.ExperimentEntity">
+ <update id="update"
parameterType="org.apache.submarine.server.experiment.database.entity.ExperimentEntity">
update experiment
<set>
<if test="experimentSpec != null">
diff --git
a/submarine-server/server-core/src/main/resources/org/apache/submarine/database/mappers/NotebookMapper.xml
b/submarine-server/server-core/src/main/resources/org/apache/submarine/database/mappers/NotebookMapper.xml
index 6c99197..11c85bf 100644
---
a/submarine-server/server-core/src/main/resources/org/apache/submarine/database/mappers/NotebookMapper.xml
+++
b/submarine-server/server-core/src/main/resources/org/apache/submarine/database/mappers/NotebookMapper.xml
@@ -18,7 +18,7 @@
under the License.
-->
<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
"http://mybatis.org/dtd/mybatis-3-mapper.dtd";>
-<mapper
namespace="org.apache.submarine.server.notebook.database.NotebookMapper">
+<mapper
namespace="org.apache.submarine.server.notebook.database.mappers.NotebookMapper">
<resultMap id="BaseEntityResultMap"
type="org.apache.submarine.server.database.entity.BaseEntity">
<id property="id" column="id"/>
<result column="create_by" property="createBy"/>
@@ -27,7 +27,7 @@
<result column="update_time" property="updateTime"/>
</resultMap>
- <resultMap id="NotebookEntityResultMap"
type="org.apache.submarine.server.notebook.database.NotebookEntity"
extends="BaseEntityResultMap">
+ <resultMap id="NotebookEntityResultMap"
type="org.apache.submarine.server.notebook.database.entity.NotebookEntity"
extends="BaseEntityResultMap">
<result column="notebook_spec" jdbcType="VARCHAR" property="notebookSpec"
/>
</resultMap>
@@ -53,13 +53,13 @@
where id = #{id,jdbcType=VARCHAR}
</delete>
- <insert id="insert"
parameterType="org.apache.submarine.server.notebook.database.NotebookEntity">
+ <insert id="insert"
parameterType="org.apache.submarine.server.notebook.database.entity.NotebookEntity">
insert into notebook (id, notebook_spec, create_by, create_time,
update_by, update_time)
values (#{id,jdbcType=VARCHAR}, #{notebookSpec,jdbcType=VARCHAR},
#{createBy,jdbcType=VARCHAR}, now(), #{updateBy,jdbcType=VARCHAR},
now())
</insert>
- <update id="update"
parameterType="org.apache.submarine.server.notebook.database.NotebookEntity">
+ <update id="update"
parameterType="org.apache.submarine.server.notebook.database.entity.NotebookEntity">
update notebook
<set>
<if test="notebookSpec != null">
diff --git
a/submarine-server/server-core/src/test/java/org/apache/submarine/server/experiment/ExperimentManagerTest.java
b/submarine-server/server-core/src/test/java/org/apache/submarine/server/experiment/ExperimentManagerTest.java
index bd8880b..ff97662 100644
---
a/submarine-server/server-core/src/test/java/org/apache/submarine/server/experiment/ExperimentManagerTest.java
+++
b/submarine-server/server-core/src/test/java/org/apache/submarine/server/experiment/ExperimentManagerTest.java
@@ -28,8 +28,8 @@ import org.apache.submarine.server.api.Submitter;
import org.apache.submarine.server.api.experiment.Experiment;
import org.apache.submarine.server.api.experiment.ExperimentId;
import org.apache.submarine.server.api.spec.ExperimentSpec;
-import org.apache.submarine.server.experiment.database.ExperimentEntity;
-import org.apache.submarine.server.experiment.database.ExperimentService;
+import org.apache.submarine.server.experiment.database.entity.ExperimentEntity;
+import
org.apache.submarine.server.experiment.database.service.ExperimentService;
import org.junit.Before;
import org.junit.Test;
import org.slf4j.Logger;
diff --git
a/submarine-server/server-core/src/test/java/org/apache/submarine/server/experiment/database/ExperimentServiceTest.java
b/submarine-server/server-core/src/test/java/org/apache/submarine/server/experiment/database/ExperimentServiceTest.java
index c6d9d0e..6377b50 100644
---
a/submarine-server/server-core/src/test/java/org/apache/submarine/server/experiment/database/ExperimentServiceTest.java
+++
b/submarine-server/server-core/src/test/java/org/apache/submarine/server/experiment/database/ExperimentServiceTest.java
@@ -19,6 +19,8 @@
package org.apache.submarine.server.experiment.database;
+import org.apache.submarine.server.experiment.database.entity.ExperimentEntity;
+import
org.apache.submarine.server.experiment.database.service.ExperimentService;
import org.junit.After;
import org.junit.Assert;
import org.junit.Test;
diff --git
a/submarine-server/server-core/src/test/java/org/apache/submarine/server/workbench/database/service/MetricServiceTest.java
b/submarine-server/server-core/src/test/java/org/apache/submarine/server/workbench/database/service/MetricServiceTest.java
index 9798151..e6469cd 100644
---
a/submarine-server/server-core/src/test/java/org/apache/submarine/server/workbench/database/service/MetricServiceTest.java
+++
b/submarine-server/server-core/src/test/java/org/apache/submarine/server/workbench/database/service/MetricServiceTest.java
@@ -18,8 +18,8 @@
*/
package org.apache.submarine.server.workbench.database.service;
-import org.apache.submarine.server.experiment.database.ExperimentEntity;
-import org.apache.submarine.server.experiment.database.ExperimentService;
+import org.apache.submarine.server.experiment.database.entity.ExperimentEntity;
+import
org.apache.submarine.server.experiment.database.service.ExperimentService;
import org.apache.submarine.server.workbench.database.entity.Metric;
import org.junit.After;
import org.junit.Before;
diff --git
a/submarine-server/server-core/src/test/java/org/apache/submarine/server/workbench/database/service/ParamServiceTest.java
b/submarine-server/server-core/src/test/java/org/apache/submarine/server/workbench/database/service/ParamServiceTest.java
index 1904329..9f5c3a4 100644
---
a/submarine-server/server-core/src/test/java/org/apache/submarine/server/workbench/database/service/ParamServiceTest.java
+++
b/submarine-server/server-core/src/test/java/org/apache/submarine/server/workbench/database/service/ParamServiceTest.java
@@ -18,8 +18,8 @@
*/
package org.apache.submarine.server.workbench.database.service;
-import org.apache.submarine.server.experiment.database.ExperimentEntity;
-import org.apache.submarine.server.experiment.database.ExperimentService;
+import org.apache.submarine.server.experiment.database.entity.ExperimentEntity;
+import
org.apache.submarine.server.experiment.database.service.ExperimentService;
import org.apache.submarine.server.workbench.database.entity.Param;
import org.junit.After;
import org.junit.Before;
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
