Repository: incubator-ranger Updated Branches: refs/heads/tag-policy e95d83fee -> fa6b45d20
RANGER-274: Addressed review comments for Review Request 35992 Signed-off-by: Madhan Neethiraj <[email protected]> Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/fa6b45d2 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/fa6b45d2 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/fa6b45d2 Branch: refs/heads/tag-policy Commit: fa6b45d20c95691c1a89c57bb12bd2fec1f03e91 Parents: e95d83f Author: Abhay Kulkarni <[email protected]> Authored: Sun Jul 5 00:39:34 2015 -0700 Committer: Madhan Neethiraj <[email protected]> Committed: Mon Jul 6 10:37:36 2015 -0700 ---------------------------------------------------------------------- .../apache/ranger/plugin/contextenricher/RangerTagProvider.java | 2 +- .../java/org/apache/ranger/plugin/service/RangerBasePlugin.java | 2 +- .../ranger/plugin/util/RangerPluginConfigPropertyRepository.java | 2 +- .../src/main/resources/service-defs/ranger-servicedef-tag.json | 2 +- .../org/apache/ranger/plugin/policyengine/TestPolicyEngine.java | 2 +- .../test/resources/policyengine/test_policyengine_tag_hdfs.json | 2 +- .../test/resources/policyengine/test_policyengine_tag_hive.json | 2 +- .../src/main/java/org/apache/ranger/biz/ServiceDBStore.java | 2 +- .../apache/ranger/common/RangerAdminConfigPropertyRepository.java | 2 +- 9 files changed, 9 insertions(+), 9 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/fa6b45d2/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerTagProvider.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerTagProvider.java b/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerTagProvider.java index ca8e903..9c4f6f9 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerTagProvider.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerTagProvider.java @@ -58,7 +58,7 @@ public class RangerTagProvider extends RangerAbstractContextEnricher implements Map<String, String> options = enricherDef != null ? enricherDef.getEnricherOptions() : null; - String tagProviderTypeString = getOption("TagProviderType", "FILE_BASED_TAG_PROVIDER"); + String tagProviderTypeString = getOption("tagProviderType", "RANGER_ADMIN_TAG_PROVIDER"); long pollingIntervalMs = getLongOption("pollingInterval", 60 * 1000); if (tagProviderTypeString.equals(TagProviderTypeEnum.FILESTORE_BASED_TAG_PROVIDER.toString())) { http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/fa6b45d2/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBasePlugin.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBasePlugin.java b/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBasePlugin.java index 6190943..bafe634 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBasePlugin.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBasePlugin.java @@ -58,7 +58,7 @@ public class RangerBasePlugin { this.serviceType = serviceType; this.appId = appId; - RangerPluginConfigPropertyRepository.getInstance(); + RangerPluginConfigPropertyRepository.init(); } public String getServiceType() { http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/fa6b45d2/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerPluginConfigPropertyRepository.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerPluginConfigPropertyRepository.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerPluginConfigPropertyRepository.java index 0c8e653..e656f72 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerPluginConfigPropertyRepository.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerPluginConfigPropertyRepository.java @@ -24,7 +24,7 @@ import org.apache.ranger.common.RangerConfigPropertyRepository; public class RangerPluginConfigPropertyRepository extends RangerConfigPropertyRepository { - public static RangerConfigPropertyRepository getInstance() { + public static RangerConfigPropertyRepository init() { RangerConfigPropertyRepository ret = instance; if (ret == null) { http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/fa6b45d2/agents-common/src/main/resources/service-defs/ranger-servicedef-tag.json ---------------------------------------------------------------------- diff --git a/agents-common/src/main/resources/service-defs/ranger-servicedef-tag.json b/agents-common/src/main/resources/service-defs/ranger-servicedef-tag.json index de384ad..96cbb82 100644 --- a/agents-common/src/main/resources/service-defs/ranger-servicedef-tag.json +++ b/agents-common/src/main/resources/service-defs/ranger-servicedef-tag.json @@ -91,7 +91,7 @@ "name" : "TagEnricher", "enricher" : "org.apache.ranger.plugin.contextenricher.RangerTagProvider", "enricherOptions" : { - "TagProviderType":"RANGER_ADMIN_TAG_PROVIDER", + "tagProviderType":"RANGER_ADMIN_TAG_PROVIDER", "pollingInterval":60000 } } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/fa6b45d2/agents-common/src/test/java/org/apache/ranger/plugin/policyengine/TestPolicyEngine.java ---------------------------------------------------------------------- diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/policyengine/TestPolicyEngine.java b/agents-common/src/test/java/org/apache/ranger/plugin/policyengine/TestPolicyEngine.java index 7c4118d..23c8809 100644 --- a/agents-common/src/test/java/org/apache/ranger/plugin/policyengine/TestPolicyEngine.java +++ b/agents-common/src/test/java/org/apache/ranger/plugin/policyengine/TestPolicyEngine.java @@ -124,7 +124,7 @@ public class TestPolicyEngine { RangerConfiguration rangerConfig = RangerConfiguration.getInstance(); rangerConfig.addResource(filePath); - RangerPluginConfigPropertyRepository.getInstance(); + RangerPluginConfigPropertyRepository.init(); } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/fa6b45d2/agents-common/src/test/resources/policyengine/test_policyengine_tag_hdfs.json ---------------------------------------------------------------------- diff --git a/agents-common/src/test/resources/policyengine/test_policyengine_tag_hdfs.json b/agents-common/src/test/resources/policyengine/test_policyengine_tag_hdfs.json index b1b18f2..f228449 100644 --- a/agents-common/src/test/resources/policyengine/test_policyengine_tag_hdfs.json +++ b/agents-common/src/test/resources/policyengine/test_policyengine_tag_hdfs.json @@ -105,7 +105,7 @@ "itemId": 1, "name" : "TagEnricher", "enricher" : "org.apache.ranger.plugin.contextenricher.RangerTagProvider", - "enricherOptions" : {"TagProviderType":"FILESTORE_BASED_TAG_PROVIDER", "pollingInterval":-1, "useTestTagProvider":"false", "dataFile":"/etc/ranger/data/resourceTags.txt"} + "enricherOptions" : {"tagProviderType":"FILESTORE_BASED_TAG_PROVIDER", "pollingInterval":-1, "useTestTagProvider":"false", "dataFile":"/etc/ranger/data/resourceTags.txt"} } ], "policyConditions": [ http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/fa6b45d2/agents-common/src/test/resources/policyengine/test_policyengine_tag_hive.json ---------------------------------------------------------------------- diff --git a/agents-common/src/test/resources/policyengine/test_policyengine_tag_hive.json b/agents-common/src/test/resources/policyengine/test_policyengine_tag_hive.json index 87f2bac..ebe788b 100644 --- a/agents-common/src/test/resources/policyengine/test_policyengine_tag_hive.json +++ b/agents-common/src/test/resources/policyengine/test_policyengine_tag_hive.json @@ -130,7 +130,7 @@ "itemId": 1, "name" : "TagEnricher", "enricher" : "org.apache.ranger.plugin.contextenricher.RangerTagProvider", - "enricherOptions" : {"TagProviderType":"RANGER_ADMIN_TAG_PROVIDER", "pollingInterval":-1, "useTestTagProvider":"true", "dataFile":"/etc/ranger/data/resourceTags.txt"} + "enricherOptions" : {"tagProviderType":"RANGER_ADMIN_TAG_PROVIDER", "pollingInterval":-1, "useTestTagProvider":"true", "dataFile":"/etc/ranger/data/resourceTags.txt"} } ], "policyConditions": [ http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/fa6b45d2/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java b/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java index 8b2bde2..3e256a6 100644 --- a/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java +++ b/security-admin/src/main/java/org/apache/ranger/biz/ServiceDBStore.java @@ -211,7 +211,7 @@ public class ServiceDBStore extends AbstractServiceStore { synchronized(ServiceDBStore.class) { if(!legacyServiceDefsInitDone) { - RangerAdminConfigPropertyRepository.getInstance(); + RangerAdminConfigPropertyRepository.init(); TransactionTemplate txTemplate = new TransactionTemplate(txManager); final ServiceDBStore dbStore = this; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/fa6b45d2/security-admin/src/main/java/org/apache/ranger/common/RangerAdminConfigPropertyRepository.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/common/RangerAdminConfigPropertyRepository.java b/security-admin/src/main/java/org/apache/ranger/common/RangerAdminConfigPropertyRepository.java index 178cb7c..946e719 100644 --- a/security-admin/src/main/java/org/apache/ranger/common/RangerAdminConfigPropertyRepository.java +++ b/security-admin/src/main/java/org/apache/ranger/common/RangerAdminConfigPropertyRepository.java @@ -21,7 +21,7 @@ package org.apache.ranger.common; public class RangerAdminConfigPropertyRepository extends RangerConfigPropertyRepository { - public static RangerConfigPropertyRepository getInstance() { + public static RangerConfigPropertyRepository init() { RangerConfigPropertyRepository ret = instance; if (ret == null) {
