[kylin] 02/15: KYLIN-5314 fix bean can not be autowired

[xxyu]

This is an automated email from the ASF dual-hosted git repository.

xxyu pushed a commit to branch kylin5
in repository https://gitbox.apache.org/repos/asf/kylin.git

commit 4b859f88c91f68fa0aea85948e16b0a40a35df3d
Author: Pengfei Zhan <pengfei.z...@kyligence.io>
AuthorDate: Wed Oct 12 20:50:19 2022 +0800

    KYLIN-5314 fix bean can not be autowired
---
 .../src/main/java/org/apache/kylin/common/KylinConfigBase.java    | 1 -
 .../java/org/apache/kylin/rest/service/AbstractModelService.java  | 8 ++++----
 2 files changed, 4 insertions(+), 5 deletions(-)

diff --git 
a/src/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java 
b/src/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
index 4d27043511..e8d777d013 100644
--- a/src/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
+++ b/src/core-common/src/main/java/org/apache/kylin/common/KylinConfigBase.java
@@ -2931,7 +2931,6 @@ public abstract class KylinConfigBase implements 
Serializable {
         return getOptional("spring.session.store-type", "");
     }
 
-
     public int getJdbcSessionMaxInactiveInterval() {
         return Integer.parseInt(getOptional("spring.session.timeout", "3600"));
     }
diff --git 
a/src/modeling-service/src/main/java/org/apache/kylin/rest/service/AbstractModelService.java
 
b/src/modeling-service/src/main/java/org/apache/kylin/rest/service/AbstractModelService.java
index 849214bd34..b46314b2e1 100644
--- 
a/src/modeling-service/src/main/java/org/apache/kylin/rest/service/AbstractModelService.java
+++ 
b/src/modeling-service/src/main/java/org/apache/kylin/rest/service/AbstractModelService.java
@@ -57,7 +57,7 @@ public class AbstractModelService extends BasicService {
     @Autowired
     public AccessService accessService;
 
-    public final void checkModelPermission(String project, String modelId) {
+    public void checkModelPermission(String project, String modelId) {
         String userName = aclEvaluate.getCurrentUserName();
         Set<String> groups = getCurrentUserGroups();
         if (AclPermissionUtil.isAdmin() || 
AclPermissionUtil.isAdminInProject(project, groups)) {
@@ -94,7 +94,7 @@ public class AbstractModelService extends BasicService {
         });
     }
 
-    public final NDataModel getModelById(String modelId, String project) {
+    public NDataModel getModelById(String modelId, String project) {
         NDataModelManager modelManager = getManager(NDataModelManager.class, 
project);
         NDataModel nDataModel = modelManager.getDataModelDesc(modelId);
         if (null == nDataModel) {
@@ -103,7 +103,7 @@ public class AbstractModelService extends BasicService {
         return nDataModel;
     }
 
-    public final NDataModel getModelByAlias(String modelAlias, String project) 
{
+    public NDataModel getModelByAlias(String modelAlias, String project) {
         NDataModelManager modelManager = getManager(NDataModelManager.class, 
project);
         NDataModel nDataModel = 
modelManager.getDataModelDescByAlias(modelAlias);
         if (null == nDataModel) {
@@ -112,7 +112,7 @@ public class AbstractModelService extends BasicService {
         return nDataModel;
     }
 
-    public final Set<String> listAllModelIdsInProject(String project) {
+    public Set<String> listAllModelIdsInProject(String project) {
         NDataModelManager dataModelManager = 
getManager(NDataModelManager.class, project);
         return dataModelManager.listAllModelIds();
     }