This is an automated email from the ASF dual-hosted git repository.
caolu pushed a commit to branch kylin5
in repository https://gitbox.apache.org/repos/asf/kylin.git
The following commit(s) were added to refs/heads/kylin5 by this push:
new 7030d11350 fix checkstyle
7030d11350 is described below
commit 7030d11350d495e51f7214e89c3c361f047837f4
Author: lionelcao <[email protected]>
AuthorDate: Mon Mar 10 16:48:29 2025 +0800
fix checkstyle
---
dev-support/checkstyle-apache.xml | 2 +-
.../common/persistence/metadata/JdbcAuditLogStore.java | 4 ++--
.../persistence/metadata/JdbcPartialAuditLogStore.java | 2 --
.../persistence/metadata/MetadataMapperFactory.java | 3 ---
.../kylin/common/persistence/metadata/MetadataStore.java | 6 ++++--
.../common/persistence/metadata/mapper/AclMapper.java | 3 ---
.../metadata/mapper/CcModelRelationMapper.java | 3 ---
.../persistence/metadata/mapper/ComputeColumnMapper.java | 3 ---
.../persistence/metadata/mapper/DataParserMapper.java | 3 ---
.../persistence/metadata/mapper/DataflowMapper.java | 3 ---
.../metadata/mapper/FusionModelDynamicSqlSupport.java | 4 ----
.../persistence/metadata/mapper/FusionModelMapper.java | 4 ----
.../metadata/mapper/HistorySourceUsageMapper.java | 3 ---
.../persistence/metadata/mapper/IndexPlanMapper.java | 3 ---
.../persistence/metadata/mapper/JarInfoMapper.java | 3 ---
.../persistence/metadata/mapper/JobStatsMapper.java | 3 ---
.../common/persistence/metadata/mapper/LayoutMapper.java | 3 ---
.../common/persistence/metadata/mapper/ModelMapper.java | 3 ---
.../persistence/metadata/mapper/ObjectAclMapper.java | 3 ---
.../persistence/metadata/mapper/ProjectMapper.java | 3 ---
.../persistence/metadata/mapper/QueryRecordMapper.java | 3 ---
.../persistence/metadata/mapper/ResourceGroupMapper.java | 3 ---
.../persistence/metadata/mapper/SegmentMapper.java | 3 ---
.../persistence/metadata/mapper/SqlBlacklistMapper.java | 3 ---
.../common/persistence/metadata/mapper/SystemMapper.java | 3 ---
.../persistence/metadata/mapper/TableExdMapper.java | 3 ---
.../metadata/mapper/TableModelRelationMapper.java | 3 ---
.../persistence/metadata/mapper/UserGlobalAclMapper.java | 3 ---
.../persistence/metadata/mapper/UserGroupMapper.java | 3 ---
.../persistence/metadata/mapper/UserInfoMapper.java | 3 ---
.../org/apache/kylin/metadata/job/JobTokenMapper.java | 16 ----------------
31 files changed, 7 insertions(+), 103 deletions(-)
diff --git a/dev-support/checkstyle-apache.xml
b/dev-support/checkstyle-apache.xml
index d1c0032962..50055f14ba 100644
--- a/dev-support/checkstyle-apache.xml
+++ b/dev-support/checkstyle-apache.xml
@@ -58,7 +58,7 @@
<module name="ModifierOrder"/>
<module name="IllegalImport">
<property name="regexp" value="true"/>
- <property name="illegalClasses"
value="com\.google\.common\.(?!collect\.ImmutableList).*"/>
+ <property name="illegalClasses" value="com\.google\.common\.*"/>
</module>
<module name="MethodLength"/>
<module name="MethodParamPad"/>
diff --git
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/JdbcAuditLogStore.java
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/JdbcAuditLogStore.java
index 924202af5d..7cab1efaf3 100644
---
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/JdbcAuditLogStore.java
+++
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/JdbcAuditLogStore.java
@@ -228,8 +228,8 @@ public class JdbcAuditLogStore implements AuditLogStore {
try {
val bs = Objects.isNull(x.getByteSource()) ? null :
x.getByteSource().read();
return new Object[] { x.getResPath(),
CompressionUtils.compress(bs), x.getTimestamp(),
- x.getMvcc(), x.getUnitId(), x.getModelUuid(),
x.getOperator(), x.getInstance(), x.getProject(),
- x.isDiffFlag() };
+ x.getMvcc(), x.getUnitId(), x.getModelUuid(),
x.getOperator(), x.getInstance(),
+ x.getProject(), x.isDiffFlag() };
} catch (IOException e) {
return null;
}
diff --git
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/JdbcPartialAuditLogStore.java
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/JdbcPartialAuditLogStore.java
index d2aecd0a89..3b23b71129 100644
---
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/JdbcPartialAuditLogStore.java
+++
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/JdbcPartialAuditLogStore.java
@@ -17,8 +17,6 @@
*/
package org.apache.kylin.common.persistence.metadata;
-import java.util.function.Predicate;
-
import org.apache.kylin.common.KylinConfig;
import lombok.extern.slf4j.Slf4j;
diff --git
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/MetadataMapperFactory.java
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/MetadataMapperFactory.java
index 1bd8d5cca8..269bf397f7 100644
---
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/MetadataMapperFactory.java
+++
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/MetadataMapperFactory.java
@@ -56,9 +56,6 @@ import lombok.val;
import lombok.var;
import lombok.extern.slf4j.Slf4j;
-/**
- * 15/11/2023 hellozepp([email protected])
- */
@Slf4j
public class MetadataMapperFactory {
diff --git
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/MetadataStore.java
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/MetadataStore.java
index 442d0a0333..72821a0a98 100644
---
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/MetadataStore.java
+++
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/MetadataStore.java
@@ -95,8 +95,10 @@ public abstract class MetadataStore implements
ITransactionManager {
}
/**
- * upload local files to snapshot, will not change resource store
synchronized, perhaps should call ResourceStore.clearCache() manually
- * @param folder local directory contains snapshot, ${folder}/events
contains event store, ${folder}/kylin.properties etc.
+ * upload local files to snapshot, will not change resource store
synchronized,
+ * perhaps should call ResourceStore.clearCache() manually
+ * @param folder local directory contains snapshot, ${folder}/events
contains event store,
+ * ${folder}/kylin.properties etc.
*/
public void uploadFromFile(File folder) {
foreachFile(folder, res -> {
diff --git
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/AclMapper.java
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/AclMapper.java
index b2e787fac3..ab729387db 100644
---
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/AclMapper.java
+++
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/AclMapper.java
@@ -22,17 +22,14 @@ import static
org.apache.kylin.common.persistence.metadata.mapper.AclDynamicSqlS
import java.util.List;
import java.util.Optional;
-import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectKey;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
import
org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
import org.apache.kylin.common.persistence.resources.AclRawResource;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
diff --git
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/CcModelRelationMapper.java
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/CcModelRelationMapper.java
index f4621443a6..83e0e377c9 100644
---
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/CcModelRelationMapper.java
+++
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/CcModelRelationMapper.java
@@ -22,18 +22,15 @@ import static
org.apache.kylin.common.persistence.metadata.mapper.CcModelRelatio
import java.util.List;
import java.util.Optional;
-import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectKey;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
import
org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
import
org.apache.kylin.common.persistence.resources.CcModelRelationRawResource;
import org.mybatis.dynamic.sql.BasicColumn;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.update.UpdateDSL;
import org.mybatis.dynamic.sql.update.UpdateModel;
diff --git
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/ComputeColumnMapper.java
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/ComputeColumnMapper.java
index 4fd1e6bc6e..099a3782d9 100644
---
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/ComputeColumnMapper.java
+++
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/ComputeColumnMapper.java
@@ -24,11 +24,9 @@ import java.util.Collection;
import java.util.List;
import java.util.Optional;
-import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectKey;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
@@ -36,7 +34,6 @@ import
org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProvid
import org.apache.kylin.common.persistence.resources.ComputeColumnRawResource;
import org.mybatis.dynamic.sql.BasicColumn;
import org.mybatis.dynamic.sql.SqlColumn;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.update.UpdateDSL;
import org.mybatis.dynamic.sql.update.UpdateModel;
diff --git
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/DataParserMapper.java
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/DataParserMapper.java
index 9b2d539b9b..2c353ec4ec 100644
---
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/DataParserMapper.java
+++
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/DataParserMapper.java
@@ -22,18 +22,15 @@ import static
org.apache.kylin.common.persistence.metadata.mapper.DataParserDyna
import java.util.List;
import java.util.Optional;
-import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectKey;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
import
org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
import org.apache.kylin.common.persistence.resources.DataParserRawResource;
import org.mybatis.dynamic.sql.BasicColumn;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.update.UpdateDSL;
import org.mybatis.dynamic.sql.update.UpdateModel;
diff --git
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/DataflowMapper.java
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/DataflowMapper.java
index 1e9a74f236..fefa1f5ecf 100644
---
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/DataflowMapper.java
+++
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/DataflowMapper.java
@@ -22,17 +22,14 @@ import static
org.apache.kylin.common.persistence.metadata.mapper.DataFlowDynami
import java.util.List;
import java.util.Optional;
-import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectKey;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
import
org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
import org.apache.kylin.common.persistence.resources.DataflowRawResource;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
diff --git
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/FusionModelDynamicSqlSupport.java
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/FusionModelDynamicSqlSupport.java
index 76c30d62e1..b7469940c9 100644
---
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/FusionModelDynamicSqlSupport.java
+++
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/FusionModelDynamicSqlSupport.java
@@ -17,10 +17,6 @@
*/
package org.apache.kylin.common.persistence.metadata.mapper;
-import java.sql.JDBCType;
-
-import org.mybatis.dynamic.sql.SqlColumn;
-
public final class FusionModelDynamicSqlSupport {
public static final FusionModel sqlTable = new FusionModel();
diff --git
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/FusionModelMapper.java
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/FusionModelMapper.java
index 69c39af557..136d20b7dc 100644
---
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/FusionModelMapper.java
+++
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/FusionModelMapper.java
@@ -30,11 +30,7 @@ import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
import
org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
import org.apache.kylin.common.persistence.resources.FusionModelRawResource;
-import org.mybatis.dynamic.sql.BasicColumn;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
-import org.mybatis.dynamic.sql.update.UpdateDSL;
-import org.mybatis.dynamic.sql.update.UpdateModel;
import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
public interface FusionModelMapper extends BasicMapper<FusionModelRawResource>
{
diff --git
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/HistorySourceUsageMapper.java
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/HistorySourceUsageMapper.java
index 61b26a7a8c..403c95ecef 100644
---
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/HistorySourceUsageMapper.java
+++
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/HistorySourceUsageMapper.java
@@ -22,18 +22,15 @@ import static
org.apache.kylin.common.persistence.metadata.mapper.HistorySourceU
import java.util.List;
import java.util.Optional;
-import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectKey;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
import
org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
import
org.apache.kylin.common.persistence.resources.HistorySourceUsageRawResource;
import org.mybatis.dynamic.sql.BasicColumn;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.update.UpdateDSL;
import org.mybatis.dynamic.sql.update.UpdateModel;
diff --git
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/IndexPlanMapper.java
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/IndexPlanMapper.java
index 40d60049d3..20f55de13f 100644
---
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/IndexPlanMapper.java
+++
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/IndexPlanMapper.java
@@ -22,17 +22,14 @@ import static
org.apache.kylin.common.persistence.metadata.mapper.IndexPlanDynam
import java.util.List;
import java.util.Optional;
-import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectKey;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
import
org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
import org.apache.kylin.common.persistence.resources.IndexPlanRawResource;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
diff --git
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/JarInfoMapper.java
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/JarInfoMapper.java
index a3d16c3aea..8a75043c2d 100644
---
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/JarInfoMapper.java
+++
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/JarInfoMapper.java
@@ -22,18 +22,15 @@ import static
org.apache.kylin.common.persistence.metadata.mapper.JarInfoDynamic
import java.util.List;
import java.util.Optional;
-import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectKey;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
import
org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
import org.apache.kylin.common.persistence.resources.JarInfoRawResource;
import org.mybatis.dynamic.sql.BasicColumn;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.update.UpdateDSL;
import org.mybatis.dynamic.sql.update.UpdateModel;
diff --git
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/JobStatsMapper.java
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/JobStatsMapper.java
index 4dbe9d16bb..90d8b04cae 100644
---
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/JobStatsMapper.java
+++
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/JobStatsMapper.java
@@ -22,18 +22,15 @@ import static
org.apache.kylin.common.persistence.metadata.mapper.JobStatsDynami
import java.util.List;
import java.util.Optional;
-import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectKey;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
import
org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
import org.apache.kylin.common.persistence.resources.JobStatsRawResource;
import org.mybatis.dynamic.sql.BasicColumn;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.update.UpdateDSL;
import org.mybatis.dynamic.sql.update.UpdateModel;
diff --git
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/LayoutMapper.java
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/LayoutMapper.java
index 27a517de43..8e085a06a1 100644
---
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/LayoutMapper.java
+++
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/LayoutMapper.java
@@ -22,18 +22,15 @@ import static
org.apache.kylin.common.persistence.metadata.mapper.LayoutDynamicS
import java.util.List;
import java.util.Optional;
-import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectKey;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
import
org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
import org.apache.kylin.common.persistence.resources.LayoutRawResource;
import org.mybatis.dynamic.sql.BasicColumn;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.update.UpdateDSL;
import org.mybatis.dynamic.sql.update.UpdateModel;
diff --git
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/ModelMapper.java
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/ModelMapper.java
index a441bc9328..90aeef9e9f 100644
---
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/ModelMapper.java
+++
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/ModelMapper.java
@@ -22,18 +22,15 @@ import static
org.apache.kylin.common.persistence.metadata.mapper.ModelDynamicSq
import java.util.List;
import java.util.Optional;
-import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectKey;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
import
org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
import org.apache.kylin.common.persistence.resources.ModelRawResource;
import org.mybatis.dynamic.sql.BasicColumn;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.update.UpdateDSL;
import org.mybatis.dynamic.sql.update.UpdateModel;
diff --git
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/ObjectAclMapper.java
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/ObjectAclMapper.java
index 4d8fe18b40..3484014a4b 100644
---
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/ObjectAclMapper.java
+++
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/ObjectAclMapper.java
@@ -22,17 +22,14 @@ import static
org.apache.kylin.common.persistence.metadata.mapper.ObjectAclDynam
import java.util.List;
import java.util.Optional;
-import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectKey;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
import
org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
import org.apache.kylin.common.persistence.resources.ObjectAclRawResource;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
diff --git
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/ProjectMapper.java
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/ProjectMapper.java
index 16365c667c..1b13979868 100644
---
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/ProjectMapper.java
+++
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/ProjectMapper.java
@@ -22,18 +22,15 @@ import static
org.apache.kylin.common.persistence.metadata.mapper.ProjectDynamic
import java.util.List;
import java.util.Optional;
-import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectKey;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
import
org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
import org.apache.kylin.common.persistence.resources.ProjectRawResource;
import org.mybatis.dynamic.sql.BasicColumn;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.update.UpdateDSL;
import org.mybatis.dynamic.sql.update.UpdateModel;
diff --git
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/QueryRecordMapper.java
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/QueryRecordMapper.java
index 84f74f2dfe..9f13530d17 100644
---
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/QueryRecordMapper.java
+++
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/QueryRecordMapper.java
@@ -22,17 +22,14 @@ import static
org.apache.kylin.common.persistence.metadata.mapper.QueryRecordDyn
import java.util.List;
import java.util.Optional;
-import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectKey;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
import
org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
import org.apache.kylin.common.persistence.resources.QueryRecordRawResource;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
diff --git
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/ResourceGroupMapper.java
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/ResourceGroupMapper.java
index 8622ff0eb6..468dbf00a3 100644
---
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/ResourceGroupMapper.java
+++
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/ResourceGroupMapper.java
@@ -22,17 +22,14 @@ import static
org.apache.kylin.common.persistence.metadata.mapper.ResourceGroupD
import java.util.List;
import java.util.Optional;
-import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectKey;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
import
org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
import org.apache.kylin.common.persistence.resources.ResourceGroupRawResource;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
diff --git
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/SegmentMapper.java
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/SegmentMapper.java
index 4cf2a50ca3..eaccfce4a0 100644
---
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/SegmentMapper.java
+++
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/SegmentMapper.java
@@ -22,18 +22,15 @@ import static
org.apache.kylin.common.persistence.metadata.mapper.SegmentDynamic
import java.util.List;
import java.util.Optional;
-import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectKey;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
import
org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
import org.apache.kylin.common.persistence.resources.SegmentRawResource;
import org.mybatis.dynamic.sql.BasicColumn;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.update.UpdateDSL;
import org.mybatis.dynamic.sql.update.UpdateModel;
diff --git
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/SqlBlacklistMapper.java
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/SqlBlacklistMapper.java
index feaf857c89..d66d1d96f7 100644
---
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/SqlBlacklistMapper.java
+++
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/SqlBlacklistMapper.java
@@ -22,17 +22,14 @@ import static
org.apache.kylin.common.persistence.metadata.mapper.SqlBlacklistDy
import java.util.List;
import java.util.Optional;
-import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectKey;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
import
org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
import org.apache.kylin.common.persistence.resources.SqlBlacklistRawResource;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.util.SqlProviderAdapter;
diff --git
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/SystemMapper.java
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/SystemMapper.java
index 3a6762cd23..8ac8599c4d 100644
---
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/SystemMapper.java
+++
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/SystemMapper.java
@@ -22,18 +22,15 @@ import static
org.apache.kylin.common.persistence.metadata.mapper.SystemDynamicS
import java.util.List;
import java.util.Optional;
-import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectKey;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
import
org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
import org.apache.kylin.common.persistence.resources.SystemRawResource;
import org.mybatis.dynamic.sql.BasicColumn;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.update.UpdateDSL;
import org.mybatis.dynamic.sql.update.UpdateModel;
diff --git
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/TableExdMapper.java
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/TableExdMapper.java
index e745710388..64f58b8b76 100644
---
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/TableExdMapper.java
+++
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/TableExdMapper.java
@@ -22,18 +22,15 @@ import static
org.apache.kylin.common.persistence.metadata.mapper.TableExdDynami
import java.util.List;
import java.util.Optional;
-import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectKey;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
import
org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
import org.apache.kylin.common.persistence.resources.TableExdRawResource;
import org.mybatis.dynamic.sql.BasicColumn;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.update.UpdateDSL;
import org.mybatis.dynamic.sql.update.UpdateModel;
diff --git
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/TableModelRelationMapper.java
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/TableModelRelationMapper.java
index c90696bdda..f09523bedd 100644
---
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/TableModelRelationMapper.java
+++
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/TableModelRelationMapper.java
@@ -22,18 +22,15 @@ import static
org.apache.kylin.common.persistence.metadata.mapper.TableModelRela
import java.util.List;
import java.util.Optional;
-import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectKey;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
import
org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
import
org.apache.kylin.common.persistence.resources.TableModelRelationRawResource;
import org.mybatis.dynamic.sql.BasicColumn;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.update.UpdateDSL;
import org.mybatis.dynamic.sql.update.UpdateModel;
diff --git
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/UserGlobalAclMapper.java
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/UserGlobalAclMapper.java
index a1b5166595..b11eb171c1 100644
---
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/UserGlobalAclMapper.java
+++
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/UserGlobalAclMapper.java
@@ -22,18 +22,15 @@ import static
org.apache.kylin.common.persistence.metadata.mapper.UserGlobalAclD
import java.util.List;
import java.util.Optional;
-import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectKey;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
import
org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
import org.apache.kylin.common.persistence.resources.UserGlobalAclRawResource;
import org.mybatis.dynamic.sql.BasicColumn;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.update.UpdateDSL;
import org.mybatis.dynamic.sql.update.UpdateModel;
diff --git
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/UserGroupMapper.java
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/UserGroupMapper.java
index cfcbe3ca59..2f30311590 100644
---
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/UserGroupMapper.java
+++
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/UserGroupMapper.java
@@ -22,18 +22,15 @@ import static
org.apache.kylin.common.persistence.metadata.mapper.UserGroupDynam
import java.util.List;
import java.util.Optional;
-import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectKey;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
import
org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
import org.apache.kylin.common.persistence.resources.UserGroupRawResource;
import org.mybatis.dynamic.sql.BasicColumn;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.update.UpdateDSL;
import org.mybatis.dynamic.sql.update.UpdateModel;
diff --git
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/UserInfoMapper.java
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/UserInfoMapper.java
index 29729fbc2e..7eda92a1e2 100644
---
a/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/UserInfoMapper.java
+++
b/src/core-common/src/main/java/org/apache/kylin/common/persistence/metadata/mapper/UserInfoMapper.java
@@ -22,18 +22,15 @@ import static
org.apache.kylin.common.persistence.metadata.mapper.UserInfoDynami
import java.util.List;
import java.util.Optional;
-import org.apache.ibatis.annotations.InsertProvider;
import org.apache.ibatis.annotations.Result;
import org.apache.ibatis.annotations.ResultMap;
import org.apache.ibatis.annotations.Results;
-import org.apache.ibatis.annotations.SelectKey;
import org.apache.ibatis.annotations.SelectProvider;
import org.apache.ibatis.type.JdbcType;
import org.apache.kylin.common.persistence.metadata.jdbc.ContentTypeHandler;
import
org.apache.kylin.common.persistence.metadata.jdbc.SqlWithRecordLockProviderAdapter;
import org.apache.kylin.common.persistence.resources.UserInfoRawResource;
import org.mybatis.dynamic.sql.BasicColumn;
-import org.mybatis.dynamic.sql.insert.render.InsertStatementProvider;
import org.mybatis.dynamic.sql.select.render.SelectStatementProvider;
import org.mybatis.dynamic.sql.update.UpdateDSL;
import org.mybatis.dynamic.sql.update.UpdateModel;
diff --git
a/src/core-metadata/src/main/java/org/apache/kylin/metadata/job/JobTokenMapper.java
b/src/core-metadata/src/main/java/org/apache/kylin/metadata/job/JobTokenMapper.java
index 872b9931d2..295d95b43a 100644
---
a/src/core-metadata/src/main/java/org/apache/kylin/metadata/job/JobTokenMapper.java
+++
b/src/core-metadata/src/main/java/org/apache/kylin/metadata/job/JobTokenMapper.java
@@ -1,19 +1,3 @@
-/*
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to you under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
package org.apache.kylin.metadata.job;
