You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@kylin.apache.org by li...@apache.org on 2017/06/29 05:48:49 UTC
[42/50] kylin git commit: minor, make MODELER ROLE as a group
minor, make MODELER ROLE as a group
Project: http://git-wip-us.apache.org/repos/asf/kylin/repo
Commit: http://git-wip-us.apache.org/repos/asf/kylin/commit/f79fa389
Tree: http://git-wip-us.apache.org/repos/asf/kylin/tree/f79fa389
Diff: http://git-wip-us.apache.org/repos/asf/kylin/diff/f79fa389
Branch: refs/heads/master
Commit: f79fa389cc4530950a26a2280811c5929d8956e2
Parents: ac725cb
Author: Roger Shi <ro...@hotmail.com>
Authored: Mon Jun 26 20:07:57 2017 +0800
Committer: Hongbin Ma <ma...@kyligence.io>
Committed: Mon Jun 26 20:23:10 2017 +0800
----------------------------------------------------------------------
.../src/main/java/org/apache/kylin/rest/constant/Constant.java | 2 +-
.../src/main/java/org/apache/kylin/rest/service/CubeService.java | 2 +-
.../main/java/org/apache/kylin/rest/service/HybridService.java | 2 +-
.../main/java/org/apache/kylin/rest/service/TableService.java | 4 ++--
4 files changed, 5 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/kylin/blob/f79fa389/server-base/src/main/java/org/apache/kylin/rest/constant/Constant.java
----------------------------------------------------------------------
diff --git a/server-base/src/main/java/org/apache/kylin/rest/constant/Constant.java b/server-base/src/main/java/org/apache/kylin/rest/constant/Constant.java
index f068e5f..5d326e9 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/constant/Constant.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/constant/Constant.java
@@ -35,7 +35,7 @@ public class Constant {
public final static String ROLE_ANALYST = "ROLE_ANALYST";
public final static String ACCESS_HAS_ROLE_ADMIN = "hasRole('ROLE_ADMIN')";
- public final static String ACCESS_HAS_ROLE_MODELER = "hasRole('ROLE_MODELER')";
+// public final static String ACCESS_HAS_ROLE_MODELER = "hasRole('ROLE_MODELER')";
public final static String ACCESS_POST_FILTER_READ = "hasRole('ROLE_ADMIN') or hasPermission(filterObject, 'READ') or hasPermission(filterObject, 'MANAGEMENT') " + "or hasPermission(filterObject, 'OPERATION') or hasPermission(filterObject, 'ADMINISTRATION')";
http://git-wip-us.apache.org/repos/asf/kylin/blob/f79fa389/server-base/src/main/java/org/apache/kylin/rest/service/CubeService.java
----------------------------------------------------------------------
diff --git a/server-base/src/main/java/org/apache/kylin/rest/service/CubeService.java b/server-base/src/main/java/org/apache/kylin/rest/service/CubeService.java
index ea5378f..a5fc36a 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/service/CubeService.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/service/CubeService.java
@@ -153,7 +153,7 @@ public class CubeService extends BasicService {
return getCubeManager().updateCube(cubeBuilder);
}
- @PreAuthorize(Constant.ACCESS_HAS_ROLE_ADMIN + " or " + Constant.ACCESS_HAS_ROLE_MODELER)
+ @PreAuthorize(Constant.ACCESS_HAS_ROLE_ADMIN)
public CubeInstance createCubeAndDesc(String cubeName, String projectName, CubeDesc desc) throws IOException {
Message msg = MsgPicker.getMsg();
http://git-wip-us.apache.org/repos/asf/kylin/blob/f79fa389/server-base/src/main/java/org/apache/kylin/rest/service/HybridService.java
----------------------------------------------------------------------
diff --git a/server-base/src/main/java/org/apache/kylin/rest/service/HybridService.java b/server-base/src/main/java/org/apache/kylin/rest/service/HybridService.java
index acb82b5..b718edf 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/service/HybridService.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/service/HybridService.java
@@ -41,7 +41,7 @@ public class HybridService extends BasicService {
private static final Logger logger = LoggerFactory.getLogger(HybridService.class);
- @PreAuthorize(Constant.ACCESS_HAS_ROLE_ADMIN + " or " + Constant.ACCESS_HAS_ROLE_MODELER)
+ @PreAuthorize(Constant.ACCESS_HAS_ROLE_ADMIN)
public HybridInstance createHybridCube(String hybridName, String projectName, String modelName, String[] cubeNames) {
List<String> args = new ArrayList<String>();
args.add("-name");
http://git-wip-us.apache.org/repos/asf/kylin/blob/f79fa389/server-base/src/main/java/org/apache/kylin/rest/service/TableService.java
----------------------------------------------------------------------
diff --git a/server-base/src/main/java/org/apache/kylin/rest/service/TableService.java b/server-base/src/main/java/org/apache/kylin/rest/service/TableService.java
index 5cbdb76..915a9be 100644
--- a/server-base/src/main/java/org/apache/kylin/rest/service/TableService.java
+++ b/server-base/src/main/java/org/apache/kylin/rest/service/TableService.java
@@ -353,7 +353,7 @@ public class TableService extends BasicService {
return descs;
}
- @PreAuthorize(Constant.ACCESS_HAS_ROLE_MODELER + " or " + Constant.ACCESS_HAS_ROLE_ADMIN)
+ @PreAuthorize(Constant.ACCESS_HAS_ROLE_ADMIN)
public void calculateCardinalityIfNotPresent(String[] tables, String submitter) throws Exception {
MetadataManager metaMgr = getMetadataManager();
ExecutableManager exeMgt = ExecutableManager.getInstance(getConfig());
@@ -372,7 +372,7 @@ public class TableService extends BasicService {
*
* @param tableName
*/
- @PreAuthorize(Constant.ACCESS_HAS_ROLE_MODELER + " or " + Constant.ACCESS_HAS_ROLE_ADMIN)
+ @PreAuthorize(Constant.ACCESS_HAS_ROLE_ADMIN)
public void calculateCardinality(String tableName, String submitter) throws Exception {
Message msg = MsgPicker.getMsg();