This is an automated email from the ASF dual-hosted git repository.
casion pushed a commit to branch dev-1.2.0
in repository https://gitbox.apache.org/repos/asf/incubator-linkis.git
The following commit(s) were added to refs/heads/dev-1.2.0 by this push:
new f6d4e3d50 [ISSUE-2475]linkis-bml-server fix package name
capitalization problem (#2466)
f6d4e3d50 is described below
commit f6d4e3d508489013bda3d0d4274868d3c80d7160
Author: 成彬彬 <[email protected]>
AuthorDate: Fri Jul 15 15:28:40 2022 +0800
[ISSUE-2475]linkis-bml-server fix package name capitalization problem
(#2466)
* org.apache.linkis.bml.Entity Package name modification
---
linkis-dist/package/conf/linkis-ps-publicservice.properties | 2 +-
.../src/main/java/org/apache/linkis/bml/dao/BmlProjectDao.java | 2 +-
.../src/main/java/org/apache/linkis/bml/dao/DownloadDao.java | 2 +-
.../src/main/java/org/apache/linkis/bml/dao/ResourceDao.java | 2 +-
.../src/main/java/org/apache/linkis/bml/dao/TaskDao.java | 2 +-
.../src/main/java/org/apache/linkis/bml/dao/VersionDao.java | 4 ++--
.../java/org/apache/linkis/bml/dao/impl/DownloadMapper.xml | 4 ++--
.../java/org/apache/linkis/bml/dao/impl/ResourceMapper.xml | 4 ++--
.../main/java/org/apache/linkis/bml/dao/impl/TaskMapper.xml | 4 ++--
.../main/java/org/apache/linkis/bml/dao/impl/VersionMapper.xml | 6 +++---
.../org/apache/linkis/bml/{Entity => entity}/BmlProject.java | 2 +-
.../apache/linkis/bml/{Entity => entity}/DownloadModel.java | 2 +-
.../org/apache/linkis/bml/{Entity => entity}/Resource.java | 2 +-
.../org/apache/linkis/bml/{Entity => entity}/ResourceTask.java | 2 +-
.../apache/linkis/bml/{Entity => entity}/ResourceVersion.java | 2 +-
.../java/org/apache/linkis/bml/{Entity => entity}/Version.java | 2 +-
.../java/org/apache/linkis/bml/restful/BmlProjectRestful.java | 4 ++--
.../main/java/org/apache/linkis/bml/restful/BmlRestfulApi.java | 10 +++++-----
.../java/org/apache/linkis/bml/service/DownloadService.java | 2 +-
.../java/org/apache/linkis/bml/service/ResourceService.java | 2 +-
.../main/java/org/apache/linkis/bml/service/TaskService.java | 2 +-
.../java/org/apache/linkis/bml/service/VersionService.java | 4 ++--
.../apache/linkis/bml/service/impl/BmlProjectServiceImpl.java | 2 +-
.../apache/linkis/bml/service/impl/DownloadServiceImpl.java | 2 +-
.../apache/linkis/bml/service/impl/ResourceServiceImpl.java | 4 ++--
.../org/apache/linkis/bml/service/impl/TaskServiceImpl.java | 8 ++++----
.../org/apache/linkis/bml/service/impl/VersionServiceImpl.java | 4 ++--
.../main/java/org/apache/linkis/bml/vo/ResourceVersionsVO.java | 2 +-
scalastyle-config.xml | 2 +-
29 files changed, 46 insertions(+), 46 deletions(-)
diff --git a/linkis-dist/package/conf/linkis-ps-publicservice.properties
b/linkis-dist/package/conf/linkis-ps-publicservice.properties
index e8376381b..73e11a6d9 100644
--- a/linkis-dist/package/conf/linkis-ps-publicservice.properties
+++ b/linkis-dist/package/conf/linkis-ps-publicservice.properties
@@ -18,7 +18,7 @@
wds.linkis.server.restful.scan.packages=org.apache.linkis.jobhistory.restful,org.apache.linkis.variable.restful,org.apache.linkis.configuration.restful,org.apache.linkis.udf.api,org.apache.linkis.filesystem.restful,org.apache.linkis.filesystem.restful,org.apache.linkis.instance.label.restful,org.apache.linkis.metadata.restful.api,org.apache.linkis.cs.server.restful,org.apache.linkis.bml.restful,org.apache.linkis.errorcode.server.restful
##mybatis
wds.linkis.server.mybatis.mapperLocations=classpath:org/apache/linkis/jobhistory/dao/impl/*.xml,classpath:org/apache/linkis/variable/dao/impl/*.xml,classpath:org/apache/linkis/configuration/dao/impl/*.xml,classpath:org/apache/linkis/udf/dao/impl/*.xml,classpath:org/apache/linkis/instance/label/dao/impl/*.xml,classpath:org/apache/linkis/metadata/hive/dao/impl/*.xml,org/apache/linkis/metadata/dao/impl/*.xml,classpath:org/apache/linkis/bml/dao/impl/*.xml
-wds.linkis.server.mybatis.typeAliasesPackage=org.apache.linkis.configuration.entity,org.apache.linkis.jobhistory.entity,org.apache.linkis.udf.entity,org.apache.linkis.variable.entity,org.apache.linkis.instance.label.entity,org.apache.linkis.manager.entity,org.apache.linkis.metadata.domain,org.apache.linkis.bml.Entity
+wds.linkis.server.mybatis.typeAliasesPackage=org.apache.linkis.configuration.entity,org.apache.linkis.jobhistory.entity,org.apache.linkis.udf.entity,org.apache.linkis.variable.entity,org.apache.linkis.instance.label.entity,org.apache.linkis.manager.entity,org.apache.linkis.metadata.domain,org.apache.linkis.bml.entity
wds.linkis.server.mybatis.BasePackage=org.apache.linkis.jobhistory.dao,org.apache.linkis.variable.dao,org.apache.linkis.configuration.dao,org.apache.linkis.udf.dao,org.apache.linkis.instance.label.dao,org.apache.linkis.metadata.hive.dao,org.apache.linkis.metadata.dao,org.apache.linkis.bml.dao,org.apache.linkis.errorcode.server.dao,org.apache.linkis.publicservice.common.lock.dao
##workspace
wds.linkis.workspace.filesystem.hdfsuserrootpath.suffix=/
diff --git
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/BmlProjectDao.java
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/BmlProjectDao.java
index 06b2065d2..f812e2d4f 100644
---
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/BmlProjectDao.java
+++
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/BmlProjectDao.java
@@ -17,7 +17,7 @@
package org.apache.linkis.bml.dao;
-import org.apache.linkis.bml.Entity.BmlProject;
+import org.apache.linkis.bml.entity.BmlProject;
import org.apache.ibatis.annotations.*;
diff --git
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/DownloadDao.java
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/DownloadDao.java
index 4e581a760..0e8c54afb 100644
---
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/DownloadDao.java
+++
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/DownloadDao.java
@@ -17,7 +17,7 @@
package org.apache.linkis.bml.dao;
-import org.apache.linkis.bml.Entity.DownloadModel;
+import org.apache.linkis.bml.entity.DownloadModel;
import org.apache.ibatis.annotations.Param;
diff --git
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/ResourceDao.java
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/ResourceDao.java
index f5dde38ac..85af7c83d 100644
---
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/ResourceDao.java
+++
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/ResourceDao.java
@@ -17,7 +17,7 @@
package org.apache.linkis.bml.dao;
-import org.apache.linkis.bml.Entity.Resource;
+import org.apache.linkis.bml.entity.Resource;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
diff --git
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/TaskDao.java
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/TaskDao.java
index eb25a0b09..1c7ee498a 100644
---
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/TaskDao.java
+++
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/TaskDao.java
@@ -17,7 +17,7 @@
package org.apache.linkis.bml.dao;
-import org.apache.linkis.bml.Entity.ResourceTask;
+import org.apache.linkis.bml.entity.ResourceTask;
import org.apache.ibatis.annotations.Param;
diff --git
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/VersionDao.java
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/VersionDao.java
index 545814a3e..78f1926e2 100644
---
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/VersionDao.java
+++
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/VersionDao.java
@@ -17,8 +17,8 @@
package org.apache.linkis.bml.dao;
-import org.apache.linkis.bml.Entity.ResourceVersion;
-import org.apache.linkis.bml.Entity.Version;
+import org.apache.linkis.bml.entity.ResourceVersion;
+import org.apache.linkis.bml.entity.Version;
import org.apache.ibatis.annotations.Param;
import org.apache.ibatis.annotations.Select;
diff --git
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/impl/DownloadMapper.xml
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/impl/DownloadMapper.xml
index 2f1d4500d..83c619674 100644
---
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/impl/DownloadMapper.xml
+++
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/impl/DownloadMapper.xml
@@ -20,13 +20,13 @@
<mapper namespace="org.apache.linkis.bml.dao.DownloadDao">
- <resultMap id="DownloadModel"
type="org.apache.linkis.bml.Entity.DownloadModel">
+ <resultMap id="DownloadModel"
type="org.apache.linkis.bml.entity.DownloadModel">
</resultMap>
<insert id="insertDownloadModel" useGeneratedKeys="true" keyColumn="id"
keyProperty="id"
- parameterType="org.apache.linkis.bml.Entity.DownloadModel">
+ parameterType="org.apache.linkis.bml.entity.DownloadModel">
insert into `linkis_ps_resources_download_history` (
`start_time`,`end_time`,`client_ip`,`state`,`resource_id`,`version`,`downloader`)
values(#{downloadModel.startTime}, #{downloadModel.endTime},
#{downloadModel.clientIp}, #{downloadModel.state}, #{downloadModel.resourceId},
#{downloadModel.version}, #{downloadModel.downloader})
</insert>
diff --git
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/impl/ResourceMapper.xml
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/impl/ResourceMapper.xml
index 52498910c..df11ce22e 100644
---
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/impl/ResourceMapper.xml
+++
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/impl/ResourceMapper.xml
@@ -20,7 +20,7 @@
<mapper namespace="org.apache.linkis.bml.dao.ResourceDao">
- <resultMap id="Resource" type="org.apache.linkis.bml.Entity.Resource">
+ <resultMap id="Resource" type="org.apache.linkis.bml.entity.Resource">
<result property="resourceId" column="resource_id"/>
<result property="user" column="owner"/>
<result property="resourceHeader" column="resource_header"/>
@@ -85,7 +85,7 @@
</where>
</update>
- <insert id="uploadResource" useGeneratedKeys="true" keyProperty="id"
keyColumn="id" parameterType="org.apache.linkis.bml.Entity.Resource">
+ <insert id="uploadResource" useGeneratedKeys="true" keyProperty="id"
keyColumn="id" parameterType="org.apache.linkis.bml.entity.Resource">
INSERT INTO linkis_ps_bml_resources(<include refid="resource_columns"/>)
VALUES
(#{resourceId},#{isPrivate},#{resourceHeader},#{downloadedFileName},#{system},
#{createTime},#{user},#{isExpire},#{expireTime},#{maxVersion},#{updateTime},
diff --git
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/impl/TaskMapper.xml
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/impl/TaskMapper.xml
index 0c233f894..e9969e7d3 100644
---
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/impl/TaskMapper.xml
+++
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/impl/TaskMapper.xml
@@ -20,7 +20,7 @@
<mapper namespace="org.apache.linkis.bml.dao.TaskDao">
- <resultMap id="ResourceTask"
type="org.apache.linkis.bml.Entity.ResourceTask">
+ <resultMap id="ResourceTask"
type="org.apache.linkis.bml.entity.ResourceTask">
<id property="id" column="id"/>
<result property="resourceId" column="resource_id"/>
<result property="version" column="version"/>
@@ -42,7 +42,7 @@
</sql>
<insert id="insert" useGeneratedKeys="true" keyProperty="id" keyColumn="id"
- parameterType="org.apache.linkis.bml.Entity.ResourceTask">
+ parameterType="org.apache.linkis.bml.entity.ResourceTask">
INSERT INTO linkis_ps_bml_resources_task(<include
refid="resource_task_columns"/>)
VALUES (#{resourceId}, #{version}, #{operation}, #{state},
#{submitUser}, #{system}, #{instance},
#{clientIp}, #{errMsg}, #{startTime}, #{endTime}, #{lastUpdateTime},
#{extraParams})
diff --git
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/impl/VersionMapper.xml
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/impl/VersionMapper.xml
index 8e3a1f680..320c88d45 100644
---
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/impl/VersionMapper.xml
+++
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/dao/impl/VersionMapper.xml
@@ -20,12 +20,12 @@
<mapper namespace="org.apache.linkis.bml.dao.VersionDao">
- <resultMap id="Version" type="org.apache.linkis.bml.Entity.Version">
+ <resultMap id="Version" type="org.apache.linkis.bml.entity.Version">
<result property="version" column="version"/>
<result property="resource" column="resource"/>
</resultMap>
- <resultMap id="ResourceVersion"
type="org.apache.linkis.bml.Entity.ResourceVersion">
+ <resultMap id="ResourceVersion"
type="org.apache.linkis.bml.entity.ResourceVersion">
<id property="id" column="id"/>
<result property="resourceId" column="resource_id"/>
<result property="user" column="owner"/>
@@ -106,7 +106,7 @@
<insert id="insertNewVersion" useGeneratedKeys="true" keyProperty="id"
keyColumn="id"
- parameterType="org.apache.linkis.bml.Entity.ResourceVersion">
+ parameterType="org.apache.linkis.bml.entity.ResourceVersion">
INSERT INTO linkis_ps_bml_resources_version(<include
refid="resource_version_columns"/>)
VALUES (#{resourceId}, #{fileMd5}, #{version}, #{size}, #{startByte},
#{endByte}, #{resource}, #{description},
#{startTime}, #{endTime}, #{clientIp}, #{updator}, #{enableFlag})
diff --git
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/Entity/BmlProject.java
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/BmlProject.java
similarity index 98%
rename from
linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/Entity/BmlProject.java
rename to
linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/BmlProject.java
index c1f69f5d7..8cb54d1c4 100644
---
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/Entity/BmlProject.java
+++
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/BmlProject.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.linkis.bml.Entity;
+package org.apache.linkis.bml.entity;
import java.util.Date;
diff --git
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/Entity/DownloadModel.java
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/DownloadModel.java
similarity index 98%
rename from
linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/Entity/DownloadModel.java
rename to
linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/DownloadModel.java
index a7e1c9e13..d96699139 100644
---
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/Entity/DownloadModel.java
+++
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/DownloadModel.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.linkis.bml.Entity;
+package org.apache.linkis.bml.entity;
import java.util.Date;
diff --git
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/Entity/Resource.java
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/Resource.java
similarity index 99%
rename from
linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/Entity/Resource.java
rename to
linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/Resource.java
index 370c2d96e..d3622daed 100644
---
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/Entity/Resource.java
+++
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/Resource.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.linkis.bml.Entity;
+package org.apache.linkis.bml.entity;
import java.util.Date;
import java.util.Map;
diff --git
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/Entity/ResourceTask.java
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/ResourceTask.java
similarity index 99%
rename from
linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/Entity/ResourceTask.java
rename to
linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/ResourceTask.java
index 98be7d604..8dfee510c 100644
---
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/Entity/ResourceTask.java
+++
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/ResourceTask.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.linkis.bml.Entity;
+package org.apache.linkis.bml.entity;
import org.apache.linkis.bml.common.Constant;
import org.apache.linkis.bml.common.OperationEnum;
diff --git
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/Entity/ResourceVersion.java
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/ResourceVersion.java
similarity index 99%
rename from
linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/Entity/ResourceVersion.java
rename to
linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/ResourceVersion.java
index eec10a4bf..2ffbe4d1a 100644
---
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/Entity/ResourceVersion.java
+++
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/ResourceVersion.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.linkis.bml.Entity;
+package org.apache.linkis.bml.entity;
import java.util.Date;
diff --git
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/Entity/Version.java
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/Version.java
similarity index 96%
rename from
linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/Entity/Version.java
rename to
linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/Version.java
index 649e51e8b..45eecb10e 100644
---
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/Entity/Version.java
+++
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/entity/Version.java
@@ -15,7 +15,7 @@
* limitations under the License.
*/
-package org.apache.linkis.bml.Entity;
+package org.apache.linkis.bml.entity;
public class Version {
diff --git
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/BmlProjectRestful.java
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/BmlProjectRestful.java
index 757354324..3ca0b12cc 100644
---
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/BmlProjectRestful.java
+++
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/BmlProjectRestful.java
@@ -17,12 +17,12 @@
package org.apache.linkis.bml.restful;
-import org.apache.linkis.bml.Entity.DownloadModel;
-import org.apache.linkis.bml.Entity.ResourceTask;
import org.apache.linkis.bml.common.BmlProjectNoEditException;
import org.apache.linkis.bml.common.BmlQueryFailException;
import org.apache.linkis.bml.common.BmlServerParaErrorException;
import org.apache.linkis.bml.conf.BmlServerConfiguration;
+import org.apache.linkis.bml.entity.DownloadModel;
+import org.apache.linkis.bml.entity.ResourceTask;
import org.apache.linkis.bml.service.*;
import org.apache.linkis.bml.util.HttpRequestHelper;
import org.apache.linkis.common.exception.ErrorException;
diff --git
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/BmlRestfulApi.java
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/BmlRestfulApi.java
index 88c3b3c27..29bbe19f5 100644
---
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/BmlRestfulApi.java
+++
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/restful/BmlRestfulApi.java
@@ -17,13 +17,13 @@
package org.apache.linkis.bml.restful;
-import org.apache.linkis.bml.Entity.DownloadModel;
-import org.apache.linkis.bml.Entity.Resource;
-import org.apache.linkis.bml.Entity.ResourceTask;
-import org.apache.linkis.bml.Entity.ResourceVersion;
-import org.apache.linkis.bml.Entity.Version;
import org.apache.linkis.bml.common.*;
import org.apache.linkis.bml.common.Constant;
+import org.apache.linkis.bml.entity.DownloadModel;
+import org.apache.linkis.bml.entity.Resource;
+import org.apache.linkis.bml.entity.ResourceTask;
+import org.apache.linkis.bml.entity.ResourceVersion;
+import org.apache.linkis.bml.entity.Version;
import org.apache.linkis.bml.service.BmlService;
import org.apache.linkis.bml.service.DownloadService;
import org.apache.linkis.bml.service.ResourceService;
diff --git
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/DownloadService.java
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/DownloadService.java
index 910435cc7..f08d8d4ac 100644
---
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/DownloadService.java
+++
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/DownloadService.java
@@ -17,7 +17,7 @@
package org.apache.linkis.bml.service;
-import org.apache.linkis.bml.Entity.DownloadModel;
+import org.apache.linkis.bml.entity.DownloadModel;
public interface DownloadService {
public void addDownloadRecord(DownloadModel downloadModel);
diff --git
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/ResourceService.java
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/ResourceService.java
index ecfaa4042..9afa898d4 100644
---
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/ResourceService.java
+++
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/ResourceService.java
@@ -17,7 +17,7 @@
package org.apache.linkis.bml.service;
-import org.apache.linkis.bml.Entity.Resource;
+import org.apache.linkis.bml.entity.Resource;
import org.apache.linkis.bml.service.impl.ResourceServiceImpl;
import org.springframework.web.multipart.MultipartFile;
diff --git
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/TaskService.java
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/TaskService.java
index e2edc1508..a293f1d47 100644
---
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/TaskService.java
+++
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/TaskService.java
@@ -17,7 +17,7 @@
package org.apache.linkis.bml.service;
-import org.apache.linkis.bml.Entity.ResourceTask;
+import org.apache.linkis.bml.entity.ResourceTask;
import org.springframework.web.multipart.MultipartFile;
diff --git
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/VersionService.java
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/VersionService.java
index 2e67d2f7a..dcd573fa8 100644
---
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/VersionService.java
+++
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/VersionService.java
@@ -17,8 +17,8 @@
package org.apache.linkis.bml.service;
-import org.apache.linkis.bml.Entity.ResourceVersion;
-import org.apache.linkis.bml.Entity.Version;
+import org.apache.linkis.bml.entity.ResourceVersion;
+import org.apache.linkis.bml.entity.Version;
import org.springframework.web.multipart.MultipartFile;
diff --git
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/BmlProjectServiceImpl.java
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/BmlProjectServiceImpl.java
index 190085abe..5d12c5aad 100644
---
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/BmlProjectServiceImpl.java
+++
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/BmlProjectServiceImpl.java
@@ -17,8 +17,8 @@
package org.apache.linkis.bml.service.impl;
-import org.apache.linkis.bml.Entity.BmlProject;
import org.apache.linkis.bml.dao.BmlProjectDao;
+import org.apache.linkis.bml.entity.BmlProject;
import org.apache.linkis.bml.service.BmlProjectService;
import org.springframework.beans.factory.annotation.Autowired;
diff --git
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/DownloadServiceImpl.java
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/DownloadServiceImpl.java
index 1444d7aab..072624070 100644
---
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/DownloadServiceImpl.java
+++
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/DownloadServiceImpl.java
@@ -17,8 +17,8 @@
package org.apache.linkis.bml.service.impl;
-import org.apache.linkis.bml.Entity.DownloadModel;
import org.apache.linkis.bml.dao.DownloadDao;
+import org.apache.linkis.bml.entity.DownloadModel;
import org.apache.linkis.bml.service.DownloadService;
import org.springframework.beans.factory.annotation.Autowired;
diff --git
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/ResourceServiceImpl.java
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/ResourceServiceImpl.java
index 753618a29..f8cb0d037 100644
---
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/ResourceServiceImpl.java
+++
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/ResourceServiceImpl.java
@@ -17,13 +17,13 @@
package org.apache.linkis.bml.service.impl;
-import org.apache.linkis.bml.Entity.Resource;
-import org.apache.linkis.bml.Entity.ResourceVersion;
import org.apache.linkis.bml.common.Constant;
import org.apache.linkis.bml.common.ResourceHelper;
import org.apache.linkis.bml.common.ResourceHelperFactory;
import org.apache.linkis.bml.dao.ResourceDao;
import org.apache.linkis.bml.dao.VersionDao;
+import org.apache.linkis.bml.entity.Resource;
+import org.apache.linkis.bml.entity.ResourceVersion;
import org.apache.linkis.bml.service.ResourceService;
import org.apache.commons.lang.StringUtils;
diff --git
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/TaskServiceImpl.java
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/TaskServiceImpl.java
index 58cc02942..320b6eb0e 100644
---
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/TaskServiceImpl.java
+++
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/TaskServiceImpl.java
@@ -17,15 +17,15 @@
package org.apache.linkis.bml.service.impl;
-import org.apache.linkis.bml.Entity.Resource;
-import org.apache.linkis.bml.Entity.ResourceTask;
-import org.apache.linkis.bml.Entity.ResourceVersion;
-import org.apache.linkis.bml.Entity.Version;
import org.apache.linkis.bml.common.*;
import org.apache.linkis.bml.common.Constant;
import org.apache.linkis.bml.dao.ResourceDao;
import org.apache.linkis.bml.dao.TaskDao;
import org.apache.linkis.bml.dao.VersionDao;
+import org.apache.linkis.bml.entity.Resource;
+import org.apache.linkis.bml.entity.ResourceTask;
+import org.apache.linkis.bml.entity.ResourceVersion;
+import org.apache.linkis.bml.entity.Version;
import org.apache.linkis.bml.service.ResourceService;
import org.apache.linkis.bml.service.TaskService;
import org.apache.linkis.bml.service.VersionService;
diff --git
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/VersionServiceImpl.java
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/VersionServiceImpl.java
index feef9932f..06ac79ce9 100644
---
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/VersionServiceImpl.java
+++
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/service/impl/VersionServiceImpl.java
@@ -17,12 +17,12 @@
package org.apache.linkis.bml.service.impl;
-import org.apache.linkis.bml.Entity.ResourceVersion;
-import org.apache.linkis.bml.Entity.Version;
import org.apache.linkis.bml.common.Constant;
import org.apache.linkis.bml.common.ResourceHelper;
import org.apache.linkis.bml.common.ResourceHelperFactory;
import org.apache.linkis.bml.dao.VersionDao;
+import org.apache.linkis.bml.entity.ResourceVersion;
+import org.apache.linkis.bml.entity.Version;
import org.apache.linkis.bml.service.ResourceService;
import org.apache.linkis.bml.service.VersionService;
import org.apache.linkis.common.io.Fs;
diff --git
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/vo/ResourceVersionsVO.java
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/vo/ResourceVersionsVO.java
index 0d7b157a0..fa2395acd 100644
---
a/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/vo/ResourceVersionsVO.java
+++
b/linkis-public-enhancements/linkis-bml/linkis-bml-server/src/main/java/org/apache/linkis/bml/vo/ResourceVersionsVO.java
@@ -17,7 +17,7 @@
package org.apache.linkis.bml.vo;
-import org.apache.linkis.bml.Entity.Version;
+import org.apache.linkis.bml.entity.Version;
import java.util.List;
diff --git a/scalastyle-config.xml b/scalastyle-config.xml
index 4786fe21a..b87737119 100644
--- a/scalastyle-config.xml
+++ b/scalastyle-config.xml
@@ -71,7 +71,7 @@ This file is divided into 3 sections:
<check level="error" class="org.scalastyle.file.FileLineLengthChecker"
enabled="true">
<parameters>
- <parameter name="maxLineLength"><![CDATA[500]]></parameter>
+ <parameter name="maxLineLength">1000</parameter>
<parameter name="tabSize"><![CDATA[2]]></parameter>
<parameter name="ignoreImports">true</parameter>
</parameters>
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
