RANGER-648: Clean-up RangerContextEnricher Interface: Removed getters - except getName() - from the interface
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/8e07c02c Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/8e07c02c Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/8e07c02c Branch: refs/heads/tag-policy Commit: 8e07c02c754365124524f70676d082067e782c88 Parents: c89b01f Author: Abhay Kulkarni <[email protected]> Authored: Fri Nov 6 13:37:07 2015 -0800 Committer: Madhan Neethiraj <[email protected]> Committed: Sun Nov 8 21:47:57 2015 -0800 ---------------------------------------------------------------------- .../RangerAbstractContextEnricher.java | 48 +++++++++----------- .../contextenricher/RangerContextEnricher.java | 16 +------ 2 files changed, 23 insertions(+), 41 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8e07c02c/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerAbstractContextEnricher.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerAbstractContextEnricher.java b/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerAbstractContextEnricher.java index c70fdb4..bd5aa5b 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerAbstractContextEnricher.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerAbstractContextEnricher.java @@ -43,7 +43,22 @@ public abstract class RangerAbstractContextEnricher implements RangerContextEnri public void setEnricherDef(RangerContextEnricherDef enricherDef) { this.enricherDef = enricherDef; } - + + @Override + public void setServiceName(String serviceName) { + this.serviceName = serviceName; + } + + @Override + public void setServiceDef(RangerServiceDef serviceDef) { + this.serviceDef = serviceDef; + } + + @Override + public void setAppId(String appId) { + this.appId = appId; + } + @Override public void init() { if(LOG.isDebugEnabled()) { @@ -56,56 +71,35 @@ public abstract class RangerAbstractContextEnricher implements RangerContextEnri } @Override - public void setServiceName(String serviceName) { - this.serviceName = serviceName; + public boolean preCleanup() { + return true; } @Override - public void setServiceDef(RangerServiceDef serviceDef) { - this.serviceDef = serviceDef; + public void cleanup() { } @Override - public void setAppId(String appId) { - this.appId = appId; + public String getName() { + return enricherDef == null ? null : enricherDef.getName(); } - - @Override public RangerContextEnricherDef getEnricherDef() { return enricherDef; } - @Override public String getServiceName() { return serviceName; } - @Override public RangerServiceDef getServiceDef() { return serviceDef; } - @Override public String getAppId() { return appId; } - - @Override - public String getName() { - return enricherDef == null ? null : enricherDef.getName(); - } - - @Override - public boolean preCleanup() { - return true; - } - - @Override - public void cleanup() { - } - public String getOption(String name) { String ret = null; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8e07c02c/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerContextEnricher.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerContextEnricher.java b/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerContextEnricher.java index c88cbf1..e6d6ab0 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerContextEnricher.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerContextEnricher.java @@ -33,20 +33,6 @@ public interface RangerContextEnricher { void setAppId(String appId); - RangerContextEnricherDef getEnricherDef(); - - String getServiceName(); - - RangerServiceDef getServiceDef(); - - String getAppId(); - - String getName(); - - //void setContextComponentServiceName(String componentServiceName); - - //void setContextComponentServiceDef(RangerServiceDef componentServiceDef); - void init(); void enrich(RangerAccessRequest request); @@ -55,4 +41,6 @@ public interface RangerContextEnricher { void cleanup(); + String getName(); + }
