Repository: incubator-ranger Updated Branches: refs/heads/master 13973e753 -> 9a424cece
RANGER-890 - Fix "unnecessary" issues Signed-off-by: Alok Lal <[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/9a424cec Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/9a424cec Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/9a424cec Branch: refs/heads/master Commit: 9a424cece10d8bf31ce8a1f326487c0d5c843622 Parents: 13973e7 Author: Colm O hEigeartaigh <[email protected]> Authored: Mon Mar 21 16:03:08 2016 +0000 Committer: Alok Lal <[email protected]> Committed: Thu Mar 24 09:56:42 2016 -0700 ---------------------------------------------------------------------- .../audit/provider/BufferedAuditProvider.java | 6 -- .../audit/provider/LocalFileLogBuffer.java | 2 +- .../RangerScriptExecutionContext.java | 56 ++++++------- dev-support/ranger-pmd-ruleset.xml | 5 -- .../hbase/RangerAuthorizationCoprocessor.java | 3 - .../authorization/knox/KnoxRangerPlugin.java | 1 - .../RangerPDPKnoxDeploymentContributor.java | 5 -- .../classloader/RangerPluginClassLoader.java | 2 +- .../org/apache/solr/common/SolrException.java | 2 - .../java/org/apache/ranger/biz/TagDBStore.java | 5 -- .../java/org/apache/ranger/biz/XAuditMgr.java | 5 -- .../security/web/filter/MyRememberMeFilter.java | 87 -------------------- .../RangerServiceDefWithAssignedIdService.java | 5 -- .../apache/ranger/service/XAuditMapService.java | 7 -- .../apache/ranger/service/XPermMapService.java | 7 -- .../apache/ranger/service/XResourceService.java | 6 +- 16 files changed, 31 insertions(+), 173 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/9a424cec/agents-audit/src/main/java/org/apache/ranger/audit/provider/BufferedAuditProvider.java ---------------------------------------------------------------------- diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/provider/BufferedAuditProvider.java b/agents-audit/src/main/java/org/apache/ranger/audit/provider/BufferedAuditProvider.java index ca842f3..31b171e 100644 --- a/agents-audit/src/main/java/org/apache/ranger/audit/provider/BufferedAuditProvider.java +++ b/agents-audit/src/main/java/org/apache/ranger/audit/provider/BufferedAuditProvider.java @@ -18,7 +18,6 @@ package org.apache.ranger.audit.provider; import java.util.Collection; -import java.util.Properties; import org.apache.ranger.audit.model.AuditEventBase; import org.apache.ranger.audit.model.AuthzAuditEvent; @@ -28,11 +27,6 @@ public abstract class BufferedAuditProvider extends BaseAuditHandler { private LogDestination<AuditEventBase> mDestination = null; @Override - public void init(Properties props) { - super.init(props); - } - - @Override public boolean log(AuditEventBase event) { if (event instanceof AuthzAuditEvent) { AuthzAuditEvent authzEvent = (AuthzAuditEvent) event; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/9a424cec/agents-audit/src/main/java/org/apache/ranger/audit/provider/LocalFileLogBuffer.java ---------------------------------------------------------------------- diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/provider/LocalFileLogBuffer.java b/agents-audit/src/main/java/org/apache/ranger/audit/provider/LocalFileLogBuffer.java index 83eb324..a671165 100644 --- a/agents-audit/src/main/java/org/apache/ranger/audit/provider/LocalFileLogBuffer.java +++ b/agents-audit/src/main/java/org/apache/ranger/audit/provider/LocalFileLogBuffer.java @@ -339,7 +339,7 @@ public class LocalFileLogBuffer<T> implements LogBuffer<T> { } boolean isCurrentFilename(String filename) { - return mBufferFilename != null && filename != null && filename.equals(mBufferFilename); + return filename != null && filename.equals(mBufferFilename); } @Override http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/9a424cec/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerScriptExecutionContext.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerScriptExecutionContext.java b/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerScriptExecutionContext.java index 449cf55..6873554 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerScriptExecutionContext.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerScriptExecutionContext.java @@ -43,7 +43,7 @@ public final class RangerScriptExecutionContext { this.accessRequest = accessRequest; } - public final String getResource() { + public String getResource() { String ret = null; Object val = getRequestContext().get(RangerAccessRequestUtil.KEY_CONTEXT_RESOURCE); @@ -58,11 +58,11 @@ public final class RangerScriptExecutionContext { return ret; } - public final Map<String, Object> getRequestContext() { + public Map<String, Object> getRequestContext() { return accessRequest.getContext(); } - public final String getRequestContextAttribute(String attributeName) { + public String getRequestContextAttribute(String attributeName) { String ret = null; if (StringUtils.isNotBlank(attributeName)) { @@ -76,27 +76,27 @@ public final class RangerScriptExecutionContext { return ret; } - public final boolean isAccessTypeAny() { return accessRequest.isAccessTypeAny(); } + public boolean isAccessTypeAny() { return accessRequest.isAccessTypeAny(); } - public final boolean isAccessTypeDelegatedAdmin() { return accessRequest.isAccessTypeDelegatedAdmin(); } + public boolean isAccessTypeDelegatedAdmin() { return accessRequest.isAccessTypeDelegatedAdmin(); } - public final String getUser() { return accessRequest.getUser(); } + public String getUser() { return accessRequest.getUser(); } - public final Set<String> getUserGroups() { return accessRequest.getUserGroups(); } + public Set<String> getUserGroups() { return accessRequest.getUserGroups(); } - public final Date getAccessTime() { return accessRequest.getAccessTime(); } + public Date getAccessTime() { return accessRequest.getAccessTime(); } - public final String getClientIPAddress() { return accessRequest.getClientIPAddress(); } + public String getClientIPAddress() { return accessRequest.getClientIPAddress(); } - public final String getClientType() { return accessRequest.getClientType(); } + public String getClientType() { return accessRequest.getClientType(); } - public final String getAction() { return accessRequest.getAction(); } + public String getAction() { return accessRequest.getAction(); } - public final String getRequestData() { return accessRequest.getRequestData(); } + public String getRequestData() { return accessRequest.getRequestData(); } - public final String getSessionId() { return accessRequest.getSessionId(); } + public String getSessionId() { return accessRequest.getSessionId(); } - public final RangerTag getCurrentTag() { + public RangerTag getCurrentTag() { RangerTag ret = null; Object val = getRequestContext().get(RangerAccessRequestUtil.KEY_CONTEXT_TAG_OBJECT); @@ -110,12 +110,12 @@ public final class RangerScriptExecutionContext { return ret; } - public final String getCurrentTagType() { + public String getCurrentTagType() { RangerTag tagObject = getCurrentTag(); return (tagObject != null) ? tagObject.getType() : null; } - public final Set<String> getAllTagTypes() { + public Set<String> getAllTagTypes() { Set<String> allTagTypes = null; List<RangerTag> tagObjectList = getAllTags(); @@ -132,7 +132,7 @@ public final class RangerScriptExecutionContext { return allTagTypes; } - public final Map<String, String> getTagAttributes(final String tagType) { + public Map<String, String> getTagAttributes(final String tagType) { Map<String, String> ret = null; if (StringUtils.isNotBlank(tagType)) { @@ -153,7 +153,7 @@ public final class RangerScriptExecutionContext { return ret; } - public final Set<String> getAttributeNames(final String tagType) { + public Set<String> getAttributeNames(final String tagType) { Set<String> ret = null; Map<String, String> attributes = getTagAttributes(tagType); @@ -164,7 +164,7 @@ public final class RangerScriptExecutionContext { return ret; } - public final String getAttributeValue(final String tagType, final String attributeName) { + public String getAttributeValue(final String tagType, final String attributeName) { String ret = null; if (StringUtils.isNotBlank(tagType) || StringUtils.isNotBlank(attributeName)) { @@ -177,7 +177,7 @@ public final class RangerScriptExecutionContext { return ret; } - public final String getAttributeValue(final String attributeName) { + public String getAttributeValue(final String attributeName) { String ret = null; if (StringUtils.isNotBlank(attributeName)) { @@ -194,18 +194,18 @@ public final class RangerScriptExecutionContext { return ret; } - public final boolean getResult() { + public boolean getResult() { return result; } - public final void setResult(final boolean result) { + public void setResult(final boolean result) { this.result = result; } // Utilities - TODO - public final Date getAsDate(String value) { + public Date getAsDate(String value) { Date ret = null; if (StringUtils.isNotBlank(value)) { @@ -225,13 +225,13 @@ public final class RangerScriptExecutionContext { return ret; } - public final Date getTagAttributeAsDate(String tagType, String attributeName) { + public Date getTagAttributeAsDate(String tagType, String attributeName) { String attrValue = getAttributeValue(tagType, attributeName); return getAsDate(attrValue); } - public final boolean isAccessedAfter(String tagType, String attributeName) { + public boolean isAccessedAfter(String tagType, String attributeName) { boolean ret = false; Date accessDate = getAccessTime(); Date expiryDate = getTagAttributeAsDate(tagType, attributeName); @@ -243,7 +243,7 @@ public final class RangerScriptExecutionContext { return ret; } - public final boolean isAccessedAfter(String attributeName) { + public boolean isAccessedAfter(String attributeName) { boolean ret = false; Date accessDate = getAccessTime(); Date expiryDate = getAsDate(getAttributeValue(attributeName)); @@ -255,7 +255,7 @@ public final class RangerScriptExecutionContext { return ret; } - public final boolean isAccessedBefore(String tagType, String attributeName) { + public boolean isAccessedBefore(String tagType, String attributeName) { boolean ret = true; Date accessDate = getAccessTime(); Date expiryDate = getTagAttributeAsDate(tagType, attributeName); @@ -267,7 +267,7 @@ public final class RangerScriptExecutionContext { return ret; } - public final boolean isAccessedBefore(String attributeName) { + public boolean isAccessedBefore(String attributeName) { boolean ret = true; Date accessDate = getAccessTime(); Date expiryDate = getAsDate(getAttributeValue(attributeName)); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/9a424cec/dev-support/ranger-pmd-ruleset.xml ---------------------------------------------------------------------- diff --git a/dev-support/ranger-pmd-ruleset.xml b/dev-support/ranger-pmd-ruleset.xml index 4db1881..da0c1ec 100644 --- a/dev-support/ranger-pmd-ruleset.xml +++ b/dev-support/ranger-pmd-ruleset.xml @@ -56,12 +56,7 @@ </rule> <rule ref="rulesets/java/migrating.xml" /> <rule ref="rulesets/java/unnecessary.xml"> - <exclude name="UnnecessaryConversionTemporary" /> - <exclude name="UnnecessaryReturn" /> - <exclude name="UnusedNullCheckInEquals" /> - <exclude name="UselessOverridingMethod" /> <exclude name="UselessParentheses" /> - <exclude name="UnnecessaryFinalModifier" /> </rule> </ruleset> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/9a424cec/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java ---------------------------------------------------------------------- diff --git a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java index fb912c3..0bcf48c 100644 --- a/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java +++ b/hbase-agent/src/main/java/org/apache/ranger/authorization/hbase/RangerAuthorizationCoprocessor.java @@ -1419,9 +1419,6 @@ class RangerHBasePlugin extends RangerBasePlugin { super("hbase", appType); } - public void init() { - super.init(); - } } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/9a424cec/knox-agent/src/main/java/org/apache/ranger/authorization/knox/KnoxRangerPlugin.java ---------------------------------------------------------------------- diff --git a/knox-agent/src/main/java/org/apache/ranger/authorization/knox/KnoxRangerPlugin.java b/knox-agent/src/main/java/org/apache/ranger/authorization/knox/KnoxRangerPlugin.java index 70ecd04..9f71574 100644 --- a/knox-agent/src/main/java/org/apache/ranger/authorization/knox/KnoxRangerPlugin.java +++ b/knox-agent/src/main/java/org/apache/ranger/authorization/knox/KnoxRangerPlugin.java @@ -80,7 +80,6 @@ public class KnoxRangerPlugin extends RangerBasePlugin { if (_topology == null) throw new IllegalStateException("_topology can't be null!"); if (_service == null) throw new IllegalStateException("_service can't be null!"); if (_user == null) throw new IllegalStateException("_user can't be null!"); - return; } RangerAccessRequest build() { http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/9a424cec/ranger-knox-plugin-shim/src/main/java/org/apache/ranger/authorization/knox/deploy/RangerPDPKnoxDeploymentContributor.java ---------------------------------------------------------------------- diff --git a/ranger-knox-plugin-shim/src/main/java/org/apache/ranger/authorization/knox/deploy/RangerPDPKnoxDeploymentContributor.java b/ranger-knox-plugin-shim/src/main/java/org/apache/ranger/authorization/knox/deploy/RangerPDPKnoxDeploymentContributor.java index e927ba6..843e6fd 100644 --- a/ranger-knox-plugin-shim/src/main/java/org/apache/ranger/authorization/knox/deploy/RangerPDPKnoxDeploymentContributor.java +++ b/ranger-knox-plugin-shim/src/main/java/org/apache/ranger/authorization/knox/deploy/RangerPDPKnoxDeploymentContributor.java @@ -45,11 +45,6 @@ public class RangerPDPKnoxDeploymentContributor extends ProviderDeploymentContri } @Override - public void initializeContribution(DeploymentContext context) { - super.initializeContribution(context); - } - - @Override public void contributeProvider( DeploymentContext context, Provider provider ) { } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/9a424cec/ranger-plugin-classloader/src/main/java/org/apache/ranger/plugin/classloader/RangerPluginClassLoader.java ---------------------------------------------------------------------- diff --git a/ranger-plugin-classloader/src/main/java/org/apache/ranger/plugin/classloader/RangerPluginClassLoader.java b/ranger-plugin-classloader/src/main/java/org/apache/ranger/plugin/classloader/RangerPluginClassLoader.java index e0c9f61..6e6166c 100644 --- a/ranger-plugin-classloader/src/main/java/org/apache/ranger/plugin/classloader/RangerPluginClassLoader.java +++ b/ranger-plugin-classloader/src/main/java/org/apache/ranger/plugin/classloader/RangerPluginClassLoader.java @@ -268,7 +268,7 @@ public class RangerPluginClassLoader extends URLClassLoader { } @Override - public Class<?> findClass(String name) throws ClassNotFoundException { + public Class<?> findClass(String name) throws ClassNotFoundException { //NOPMD return super.findClass(name); } } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/9a424cec/ranger_solrj/src/main/java/org/apache/solr/common/SolrException.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/common/SolrException.java b/ranger_solrj/src/main/java/org/apache/solr/common/SolrException.java index 02bbc04..3430ff8 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/common/SolrException.java +++ b/ranger_solrj/src/main/java/org/apache/solr/common/SolrException.java @@ -154,8 +154,6 @@ public class SolrException extends RuntimeException { } // public String toString() { return toStr(this); } // oops, inf loop - @Override - public String toString() { return super.toString(); } public static String toStr(Throwable e) { CharArrayWriter cw = new CharArrayWriter(); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/9a424cec/security-admin/src/main/java/org/apache/ranger/biz/TagDBStore.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/biz/TagDBStore.java b/security-admin/src/main/java/org/apache/ranger/biz/TagDBStore.java index aa26340..cc2386e 100644 --- a/security-admin/src/main/java/org/apache/ranger/biz/TagDBStore.java +++ b/security-admin/src/main/java/org/apache/ranger/biz/TagDBStore.java @@ -88,11 +88,6 @@ public class TagDBStore extends AbstractTagStore { GUIDUtil guidUtil; @Override - public void init() throws Exception { - super.init(); - } - - @Override public RangerTagDef createTagDef(RangerTagDef tagDef) throws Exception { if (LOG.isDebugEnabled()) { LOG.debug("==> TagDBStore.createTagDef(" + tagDef + ")"); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/9a424cec/security-admin/src/main/java/org/apache/ranger/biz/XAuditMgr.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/biz/XAuditMgr.java b/security-admin/src/main/java/org/apache/ranger/biz/XAuditMgr.java index 02d725f..5b07620 100644 --- a/security-admin/src/main/java/org/apache/ranger/biz/XAuditMgr.java +++ b/security-admin/src/main/java/org/apache/ranger/biz/XAuditMgr.java @@ -104,11 +104,6 @@ public class XAuditMgr extends XAuditMgrBase { } @Override - public VXAccessAudit getXAccessAudit(Long id) { - return super.getXAccessAudit(id); - } - - @Override public VXAccessAuditList searchXAccessAudits(SearchCriteria searchCriteria) { if (rangerBizUtil.getAuditDBType().equalsIgnoreCase("solr")) { return solrAccessAuditsService.searchXAccessAudits(searchCriteria); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/9a424cec/security-admin/src/main/java/org/apache/ranger/security/web/filter/MyRememberMeFilter.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/security/web/filter/MyRememberMeFilter.java b/security-admin/src/main/java/org/apache/ranger/security/web/filter/MyRememberMeFilter.java index 9867bb0..a2252fe 100644 --- a/security-admin/src/main/java/org/apache/ranger/security/web/filter/MyRememberMeFilter.java +++ b/security-admin/src/main/java/org/apache/ranger/security/web/filter/MyRememberMeFilter.java @@ -32,12 +32,8 @@ import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import org.apache.log4j.Logger; -import org.springframework.context.ApplicationEventPublisher; -import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.core.Authentication; import org.springframework.security.core.AuthenticationException; -import org.springframework.security.web.authentication.AuthenticationSuccessHandler; -import org.springframework.security.web.authentication.RememberMeServices; import org.springframework.security.web.authentication.rememberme.RememberMeAuthenticationFilter; /** @@ -53,18 +49,6 @@ public class MyRememberMeFilter extends RememberMeAuthenticationFilter { * (non-Javadoc) * * @see org.springframework.security.web.authentication.rememberme. - * RememberMeAuthenticationFilter#afterPropertiesSet() - */ - @Override - public void afterPropertiesSet() { - // TODO Auto-generated method stub - super.afterPropertiesSet(); - } - - /* - * (non-Javadoc) - * - * @see org.springframework.security.web.authentication.rememberme. * RememberMeAuthenticationFilter#doFilter(javax.servlet.ServletRequest, * javax.servlet.ServletResponse, javax.servlet.FilterChain) */ @@ -80,18 +64,6 @@ public class MyRememberMeFilter extends RememberMeAuthenticationFilter { * (non-Javadoc) * * @see org.springframework.security.web.authentication.rememberme. - * RememberMeAuthenticationFilter#getRememberMeServices() - */ - @Override - public RememberMeServices getRememberMeServices() { - // TODO Auto-generated method stub - return super.getRememberMeServices(); - } - - /* - * (non-Javadoc) - * - * @see org.springframework.security.web.authentication.rememberme. * RememberMeAuthenticationFilter * #onSuccessfulAuthentication(javax.servlet.http.HttpServletRequest, * javax.servlet.http.HttpServletResponse, @@ -125,63 +97,4 @@ public class MyRememberMeFilter extends RememberMeAuthenticationFilter { super.onUnsuccessfulAuthentication(request, response, failed); } - /* - * (non-Javadoc) - * - * @see org.springframework.security.web.authentication.rememberme. - * RememberMeAuthenticationFilter - * #setApplicationEventPublisher(org.springframework - * .context.ApplicationEventPublisher) - */ - @Override - public void setApplicationEventPublisher( - ApplicationEventPublisher eventPublisher) { - // TODO Auto-generated method stub - super.setApplicationEventPublisher(eventPublisher); - } - - /* - * (non-Javadoc) - * - * @see org.springframework.security.web.authentication.rememberme. - * RememberMeAuthenticationFilter - * #setAuthenticationManager(org.springframework - * .security.authentication.AuthenticationManager) - */ - @Override - public void setAuthenticationManager( - AuthenticationManager authenticationManager) { - // TODO Auto-generated method stub - super.setAuthenticationManager(authenticationManager); - } - - /* - * (non-Javadoc) - * - * @see org.springframework.security.web.authentication.rememberme. - * RememberMeAuthenticationFilter - * #setAuthenticationSuccessHandler(org.springframework - * .security.web.authentication.AuthenticationSuccessHandler) - */ - @Override - public void setAuthenticationSuccessHandler( - AuthenticationSuccessHandler successHandler) { - // TODO Auto-generated method stub - super.setAuthenticationSuccessHandler(successHandler); - } - - /* - * (non-Javadoc) - * - * @see org.springframework.security.web.authentication.rememberme. - * RememberMeAuthenticationFilter - * #setRememberMeServices(org.springframework.security - * .web.authentication.RememberMeServices) - */ - @Override - public void setRememberMeServices(RememberMeServices rememberMeServices) { - // TODO Auto-generated method stub - super.setRememberMeServices(rememberMeServices); - } - } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/9a424cec/security-admin/src/main/java/org/apache/ranger/service/RangerServiceDefWithAssignedIdService.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/RangerServiceDefWithAssignedIdService.java b/security-admin/src/main/java/org/apache/ranger/service/RangerServiceDefWithAssignedIdService.java index 7fc54b1..4180a70 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/RangerServiceDefWithAssignedIdService.java +++ b/security-admin/src/main/java/org/apache/ranger/service/RangerServiceDefWithAssignedIdService.java @@ -46,11 +46,6 @@ public class RangerServiceDefWithAssignedIdService extends RangerServiceDefServi } - @Override - protected RangerServiceDef populateViewBean(XXServiceDefWithAssignedId xServiceDef) { - return super.populateViewBean(xServiceDef); - } - public RangerServiceDef getPopulatedViewObject(XXServiceDefWithAssignedId xServiceDef) { return this.populateViewBean(xServiceDef); } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/9a424cec/security-admin/src/main/java/org/apache/ranger/service/XAuditMapService.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/XAuditMapService.java b/security-admin/src/main/java/org/apache/ranger/service/XAuditMapService.java index e118494..80d9947 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/XAuditMapService.java +++ b/security-admin/src/main/java/org/apache/ranger/service/XAuditMapService.java @@ -26,7 +26,6 @@ import java.util.List; import org.apache.ranger.biz.RangerBizUtil; import org.apache.ranger.common.AppConstants; -import org.apache.ranger.common.SearchCriteria; import org.apache.ranger.common.SearchField; import org.apache.ranger.common.view.VTrxLogAttr; import org.apache.ranger.db.RangerDaoManager; @@ -36,7 +35,6 @@ import org.apache.ranger.entity.XXTrxLog; import org.apache.ranger.entity.XXUser; import org.apache.ranger.util.RangerEnumUtil; import org.apache.ranger.view.VXAuditMap; -import org.apache.ranger.view.VXAuditMapList; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; import org.springframework.stereotype.Service; @@ -200,9 +198,4 @@ public class XAuditMapService extends return vObj; } - @Override - public VXAuditMapList searchXAuditMaps(SearchCriteria searchCriteria) { - return super.searchXAuditMaps(searchCriteria); - } - } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/9a424cec/security-admin/src/main/java/org/apache/ranger/service/XPermMapService.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/XPermMapService.java b/security-admin/src/main/java/org/apache/ranger/service/XPermMapService.java index c20373d..e88f6b3 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/XPermMapService.java +++ b/security-admin/src/main/java/org/apache/ranger/service/XPermMapService.java @@ -26,7 +26,6 @@ import java.util.List; import org.apache.ranger.biz.RangerBizUtil; import org.apache.ranger.common.AppConstants; -import org.apache.ranger.common.SearchCriteria; import org.apache.ranger.common.SearchField; import org.apache.ranger.common.view.VTrxLogAttr; import org.apache.ranger.db.RangerDaoManager; @@ -38,7 +37,6 @@ import org.apache.ranger.entity.XXUser; import org.apache.ranger.util.RangerEnumUtil; import org.apache.ranger.view.VXGroup; import org.apache.ranger.view.VXPermMap; -import org.apache.ranger.view.VXPermMapList; import org.apache.ranger.view.VXUser; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Scope; @@ -117,11 +115,6 @@ public class XPermMapService extends XPermMapServiceBase<XXPermMap, VXPermMap> { return map; } - @Override - public VXPermMapList searchXPermMaps(SearchCriteria searchCriteria) { - return super.searchXPermMaps(searchCriteria); - } - public String getGroupName(Long groupId){ if(groupId!=null && groupId!=0){ VXGroup vXGroup = xGroupService.readResource(groupId); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/9a424cec/security-admin/src/main/java/org/apache/ranger/service/XResourceService.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/XResourceService.java b/security-admin/src/main/java/org/apache/ranger/service/XResourceService.java index 77d6c8c..fbb53d2 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/XResourceService.java +++ b/security-admin/src/main/java/org/apache/ranger/service/XResourceService.java @@ -321,10 +321,6 @@ public class XResourceService extends resource.setAuditList(newAuditMapList); return resource; } - @Override - public boolean deleteResource(Long id) { - return super.deleteResource(id); - } @Override public VXResource populateViewBean(XXResource xXResource) { @@ -1126,4 +1122,4 @@ public class XResourceService extends } return returnList; } -} \ No newline at end of file +}
