Repository: incubator-ranger Updated Branches: refs/heads/stack 6f06c8cda -> 2ca971756
RANGER-203: Replaced AuditProviderFactory.ApplicationType with String values, since the plugin types are known only at runtime (commit #2). Project: http://git-wip-us.apache.org/repos/asf/incubator-ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-ranger/commit/2ca97175 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/2ca97175 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/2ca97175 Branch: refs/heads/stack Commit: 2ca971756db6ff2a1c812dcab527ff79968122e5 Parents: 6f06c8c Author: Madhan Neethiraj <[email protected]> Authored: Thu Jan 22 18:21:08 2015 -0800 Committer: Madhan Neethiraj <[email protected]> Committed: Thu Jan 22 18:21:08 2015 -0800 ---------------------------------------------------------------------- .../audit/provider/AuditProviderFactory.java | 47 +------------------- 1 file changed, 2 insertions(+), 45 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/2ca97175/agents-audit/src/main/java/org/apache/ranger/audit/provider/AuditProviderFactory.java ---------------------------------------------------------------------- diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/provider/AuditProviderFactory.java b/agents-audit/src/main/java/org/apache/ranger/audit/provider/AuditProviderFactory.java index cddf546..8decfc2 100644 --- a/agents-audit/src/main/java/org/apache/ranger/audit/provider/AuditProviderFactory.java +++ b/agents-audit/src/main/java/org/apache/ranger/audit/provider/AuditProviderFactory.java @@ -37,9 +37,6 @@ import org.apache.ranger.audit.provider.hdfs.HdfsAuditProvider; */ public class AuditProviderFactory { - - public enum ApplicationType { Unknown, Hdfs, HiveCLI, HiveServer2, HBaseMaster, HBaseRegionalServer, Knox, Storm }; - private static final Log LOG = LogFactory.getLog(AuditProviderFactory.class); private static final String AUDIT_IS_ENABLED_PROP = "xasecure.audit.is.enabled" ; @@ -85,7 +82,7 @@ public class AuditProviderFactory { return mInitDone; } - public synchronized void init(Properties props, ApplicationType appType) { + public synchronized void init(Properties props, String appType) { LOG.info("AuditProviderFactory: initializing.."); if(mInitDone) { @@ -95,7 +92,7 @@ public class AuditProviderFactory { } mInitDone = true; - setApplicationType(appType); + MiscUtil.setApplicationType(appType); boolean isEnabled = BaseAuditProvider.getBooleanProperty(props, AUDIT_IS_ENABLED_PROP, false); boolean isAuditToDbEnabled = BaseAuditProvider.getBooleanProperty(props, AUDIT_DB_IS_ENABLED_PROP, false); @@ -182,46 +179,6 @@ public class AuditProviderFactory { Runtime.getRuntime().addShutdownHook(jvmShutdownHook); } - - private static void setApplicationType(ApplicationType appType) { - String strAppType = null; - - switch(appType) { - case Hdfs: - strAppType = "hdfs"; - break; - - case HiveCLI: - strAppType = "hiveCli"; - break; - - case HiveServer2: - strAppType = "hiveServer2"; - break; - - case HBaseMaster: - strAppType = "hbaseMaster"; - break; - - case HBaseRegionalServer: - strAppType = "hbaseRegional"; - break; - - case Knox: - strAppType = "knox"; - break; - - case Storm: - strAppType = "storm"; - break; - - case Unknown: - strAppType = "unknown"; - break; - } - - MiscUtil.setApplicationType(strAppType); - } private AuditProvider getDefaultProvider() { return new DummyAuditProvider();
