Repository: incubator-ranger Updated Branches: refs/heads/master a5fbb33a2 -> 8d694aa3d
RANGER-937 - Fix unused local variables issue Signed-off-by: sneethiraj <[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/8d694aa3 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/8d694aa3 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/8d694aa3 Branch: refs/heads/master Commit: 8d694aa3d9a837180afe9a8e2b45ce8a3dfb2850 Parents: a5fbb33 Author: Colm O hEigeartaigh <[email protected]> Authored: Mon Jun 20 12:12:52 2016 +0100 Committer: sneethiraj <[email protected]> Committed: Mon Jul 11 09:37:01 2016 -0400 ---------------------------------------------------------------------- dev-support/ranger-pmd-ruleset.xml | 1 - .../ranger/services/hive/client/HiveResourceMgr.java | 7 ------- .../main/java/org/apache/util/sql/MySQLPLRunner.java | 5 ++--- .../org/apache/hadoop/crypto/key/DB2HSMMKUtil.java | 1 - .../org/apache/hadoop/crypto/key/HSM2DBMKUtil.java | 1 - .../java/org/apache/hadoop/crypto/key/RangerHSM.java | 1 - .../services/kafka/client/ServiceKafkaClient.java | 2 -- .../solr/authorizer/RangerSolrAuthorizer.java | 3 --- .../ranger/services/yarn/client/YarnResourceMgr.java | 1 - .../ranger/authorization/hive/udf/RangerUdfMask.java | 2 +- .../solrj/request/JavaBinUpdateRequestCodec.java | 13 ------------- .../src/main/java/org/apache/ranger/biz/XUserMgr.java | 4 ++-- .../java/org/apache/ranger/common/ServiceUtil.java | 5 ----- .../main/java/org/apache/ranger/rest/ServiceREST.java | 1 - .../filter/RangerSecurityContextFormationFilter.java | 1 - .../org/apache/ranger/service/XResourceService.java | 5 +---- .../java/org/apache/ranger/service/XTrxLogService.java | 4 +--- .../ranger/services/storm/client/StormResourceMgr.java | 1 - 18 files changed, 7 insertions(+), 51 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8d694aa3/dev-support/ranger-pmd-ruleset.xml ---------------------------------------------------------------------- diff --git a/dev-support/ranger-pmd-ruleset.xml b/dev-support/ranger-pmd-ruleset.xml index 96f566a..b3cf4fd 100644 --- a/dev-support/ranger-pmd-ruleset.xml +++ b/dev-support/ranger-pmd-ruleset.xml @@ -35,7 +35,6 @@ <exclude name="OverrideBothEqualsAndHashcode" /> </rule> <rule ref="rulesets/java/unusedcode.xml"> - <exclude name="UnusedLocalVariable" /> <exclude name="UnusedPrivateField" /> <exclude name="UnusedPrivateMethod" /> </rule> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8d694aa3/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveResourceMgr.java ---------------------------------------------------------------------- diff --git a/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveResourceMgr.java b/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveResourceMgr.java index 69f31d8..ea21cab 100644 --- a/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveResourceMgr.java +++ b/hive-agent/src/main/java/org/apache/ranger/services/hive/client/HiveResourceMgr.java @@ -68,11 +68,9 @@ public class HiveResourceMgr { List<String> resultList = null; List<String> databaseList = null; List<String> tableList = null; - List<String> udfList = null; List<String> columnList = null; String databaseName = null; String tableName = null; - String udfName = null; String columnName = null; @@ -84,7 +82,6 @@ public class HiveResourceMgr { if ( resourceMap != null && !resourceMap.isEmpty() ) { databaseList = resourceMap.get(DATABASE); tableList = resourceMap.get(TABLE); - udfList = resourceMap.get(UDF); columnList = resourceMap.get(COLUMN); } switch (resource.trim().toLowerCase()) { @@ -94,9 +91,6 @@ public class HiveResourceMgr { case TABLE: tableName = userInput; break; - case UDF: - udfName = userInput; - break; case COLUMN: columnName = userInput; break; @@ -122,7 +116,6 @@ public class HiveResourceMgr { final List<String> finaldatabaseList = databaseList; final List<String> finaltableList = tableList; - final List<String> finaludfList = udfList; final List<String> finalcolumnList = columnList; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8d694aa3/jisql/src/main/java/org/apache/util/sql/MySQLPLRunner.java ---------------------------------------------------------------------- diff --git a/jisql/src/main/java/org/apache/util/sql/MySQLPLRunner.java b/jisql/src/main/java/org/apache/util/sql/MySQLPLRunner.java index c072142..b2eda30 100644 --- a/jisql/src/main/java/org/apache/util/sql/MySQLPLRunner.java +++ b/jisql/src/main/java/org/apache/util/sql/MySQLPLRunner.java @@ -25,7 +25,6 @@ import java.io.LineNumberReader; import java.io.PrintWriter; import java.io.Reader; import java.sql.Connection; -import java.sql.Driver; import java.sql.DriverManager; import java.sql.ResultSet; import java.sql.ResultSetMetaData; @@ -295,7 +294,7 @@ public class MySQLPLRunner { String driverName = "com.mysql.jdbc.Driver"; Properties props = null; try { - Driver driver = (Driver) Class.forName(driverName).newInstance(); + Class.forName(driverName).newInstance(); props = new Properties(); props.put("user", "root"); @@ -355,4 +354,4 @@ public class MySQLPLRunner { } } } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8d694aa3/kms/src/main/java/org/apache/hadoop/crypto/key/DB2HSMMKUtil.java ---------------------------------------------------------------------- diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/DB2HSMMKUtil.java b/kms/src/main/java/org/apache/hadoop/crypto/key/DB2HSMMKUtil.java index ca69dc0..9509b86 100644 --- a/kms/src/main/java/org/apache/hadoop/crypto/key/DB2HSMMKUtil.java +++ b/kms/src/main/java/org/apache/hadoop/crypto/key/DB2HSMMKUtil.java @@ -79,7 +79,6 @@ public class DB2HSMMKUtil { RangerKMSDB rangerkmsDb = new RangerKMSDB(conf); DaoManager daoManager = rangerkmsDb.getDaoManager(); - RangerKeyStore dbStore = new RangerKeyStore(daoManager); String password = conf.get(ENCRYPTION_KEY); // Get Master Key from Ranger DB http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8d694aa3/kms/src/main/java/org/apache/hadoop/crypto/key/HSM2DBMKUtil.java ---------------------------------------------------------------------- diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/HSM2DBMKUtil.java b/kms/src/main/java/org/apache/hadoop/crypto/key/HSM2DBMKUtil.java index 73a5830..5671abe 100644 --- a/kms/src/main/java/org/apache/hadoop/crypto/key/HSM2DBMKUtil.java +++ b/kms/src/main/java/org/apache/hadoop/crypto/key/HSM2DBMKUtil.java @@ -78,7 +78,6 @@ public class HSM2DBMKUtil { RangerKMSDB rangerkmsDb = new RangerKMSDB(conf); DaoManager daoManager = rangerkmsDb.getDaoManager(); - RangerKeyStore dbStore = new RangerKeyStore(daoManager); String password = conf.get(ENCRYPTION_KEY); // Get Master Key from HSM http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8d694aa3/kms/src/main/java/org/apache/hadoop/crypto/key/RangerHSM.java ---------------------------------------------------------------------- diff --git a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerHSM.java b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerHSM.java index b937f0c..606706b 100644 --- a/kms/src/main/java/org/apache/hadoop/crypto/key/RangerHSM.java +++ b/kms/src/main/java/org/apache/hadoop/crypto/key/RangerHSM.java @@ -91,7 +91,6 @@ public class RangerHSM implements RangerKMSMKI { keyGen = KeyGenerator.getInstance(MK_CIPHER, hsm_keystore); keyGen.init(MK_KeySize); aesKey = keyGen.generateKey(); - String masterKey = Base64.encode(aesKey.getEncoded()) ; myStore.setKeyEntry(alias, aesKey, password.toCharArray(), (java.security.cert.Certificate[]) null); return true; } catch (Exception e) { http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8d694aa3/plugin-kafka/src/main/java/org/apache/ranger/services/kafka/client/ServiceKafkaClient.java ---------------------------------------------------------------------- diff --git a/plugin-kafka/src/main/java/org/apache/ranger/services/kafka/client/ServiceKafkaClient.java b/plugin-kafka/src/main/java/org/apache/ranger/services/kafka/client/ServiceKafkaClient.java index cd866b9..30cee7f 100644 --- a/plugin-kafka/src/main/java/org/apache/ranger/services/kafka/client/ServiceKafkaClient.java +++ b/plugin-kafka/src/main/java/org/apache/ranger/services/kafka/client/ServiceKafkaClient.java @@ -29,7 +29,6 @@ import java.util.concurrent.TimeUnit; import kafka.utils.ZkUtils; import kafka.utils.ZkUtils$; -import org.apache.kafka.common.security.JaasUtils; import org.I0Itec.zkclient.*; import org.apache.log4j.Logger; import org.apache.ranger.plugin.client.BaseClient; @@ -92,7 +91,6 @@ public class ServiceKafkaClient { zkClient = ZkUtils$.MODULE$.createZkClient(zookeeperConnect, sessionTimeout, connectionTimeout); zkConnection = new ZkConnection(zookeeperConnect, sessionTimeout); - boolean zkSecurityEnabled = JaasUtils.isZkSecurityEnabled(); ZkUtils zkUtils = new ZkUtils(zkClient, zkConnection, true); Seq<String> topicList = zkUtils.getChildrenParentMayNotExist(ZkUtils.BrokerTopicsPath()); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8d694aa3/plugin-solr/src/main/java/org/apache/ranger/authorization/solr/authorizer/RangerSolrAuthorizer.java ---------------------------------------------------------------------- diff --git a/plugin-solr/src/main/java/org/apache/ranger/authorization/solr/authorizer/RangerSolrAuthorizer.java b/plugin-solr/src/main/java/org/apache/ranger/authorization/solr/authorizer/RangerSolrAuthorizer.java index b49cdc0..57fd3ed 100644 --- a/plugin-solr/src/main/java/org/apache/ranger/authorization/solr/authorizer/RangerSolrAuthorizer.java +++ b/plugin-solr/src/main/java/org/apache/ranger/authorization/solr/authorizer/RangerSolrAuthorizer.java @@ -174,9 +174,6 @@ public class RangerSolrAuthorizer implements AuthorizationPlugin { ip = context.getHttpHeader("REMOTE_ADDR"); } - String requestData = context.getResource() + ":" - + context.getParams(); - // Create the list of requests for access check. Each field is // broken // into a request http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8d694aa3/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnResourceMgr.java ---------------------------------------------------------------------- diff --git a/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnResourceMgr.java b/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnResourceMgr.java index f8ec8c6..733fe3d 100644 --- a/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnResourceMgr.java +++ b/plugin-yarn/src/main/java/org/apache/ranger/services/yarn/client/YarnResourceMgr.java @@ -52,7 +52,6 @@ public class YarnResourceMgr { public static List<String> getYarnResources(String serviceName, Map<String, String> configs,ResourceLookupContext context) { String userInput = context.getUserInput(); - String resource = context.getResourceName(); Map<String, List<String>> resourceMap = context.getResources(); List<String> resultList = null; List<String> yarnQueueList = null; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8d694aa3/ranger-hive-utils/src/main/java/org/apache/ranger/authorization/hive/udf/RangerUdfMask.java ---------------------------------------------------------------------- diff --git a/ranger-hive-utils/src/main/java/org/apache/ranger/authorization/hive/udf/RangerUdfMask.java b/ranger-hive-utils/src/main/java/org/apache/ranger/authorization/hive/udf/RangerUdfMask.java index fd8ebba..d85ee2b 100644 --- a/ranger-hive-utils/src/main/java/org/apache/ranger/authorization/hive/udf/RangerUdfMask.java +++ b/ranger-hive-utils/src/main/java/org/apache/ranger/authorization/hive/udf/RangerUdfMask.java @@ -198,7 +198,7 @@ class MaskTransformer extends AbstractTransformer { long ret = 0; long pos = 1; - for(int i = 0; val != 0; i++) { + while (val != 0) { ret += maskedNumber * pos; val /= 10; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8d694aa3/ranger_solrj/src/main/java/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java ---------------------------------------------------------------------- diff --git a/ranger_solrj/src/main/java/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java b/ranger_solrj/src/main/java/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java index ad4df43..b46dc94 100644 --- a/ranger_solrj/src/main/java/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java +++ b/ranger_solrj/src/main/java/org/apache/solr/client/solrj/request/JavaBinUpdateRequestCodec.java @@ -19,12 +19,10 @@ package org.apache.solr.client.solrj.request; import java.io.IOException; import java.io.InputStream; import java.io.OutputStream; -import java.util.ArrayList; import java.util.Collections; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Map.Entry; import org.apache.solr.common.SolrInputDocument; import org.apache.solr.common.params.ModifiableSolrParams; @@ -96,8 +94,6 @@ public class JavaBinUpdateRequestCodec { */ public UpdateRequest unmarshal(InputStream is, final StreamingUpdateHandler handler) throws IOException { final UpdateRequest updateRequest = new UpdateRequest(); - List<List<NamedList>> doclist; - List<Entry<SolrInputDocument,Map<Object,Object>>> docMap; List<String> delById; Map<String,Map<String,Object>> delByIdMap; List<String> delByQ; @@ -183,15 +179,6 @@ public class JavaBinUpdateRequestCodec { delById = (List<String>) namedList[0].get("delById"); delByIdMap = (Map<String,Map<String,Object>>) namedList[0].get("delByIdMap"); delByQ = (List<String>) namedList[0].get("delByQ"); - doclist = (List) namedList[0].get("docs"); - Object docsMapObj = namedList[0].get("docsMap"); - - if (docsMapObj instanceof Map) {//SOLR-5762 - docMap = new ArrayList(((Map)docsMapObj).entrySet()); - } else { - docMap = (List<Entry<SolrInputDocument, Map<Object, Object>>>) docsMapObj; - } - // we don't add any docs, because they were already processed // deletes are handled later, and must be passed back on the UpdateRequest http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8d694aa3/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java b/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java index 43de760..242a27e 100644 --- a/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java +++ b/security-admin/src/main/java/org/apache/ranger/biz/XUserMgr.java @@ -1406,8 +1406,8 @@ public class XUserMgr extends XUserMgrBase { public Collection<String> getMaskedCollection(Collection<String> listunMasked){ List<String> listMasked=new ArrayList<String>(); - if(listunMasked!=null && listunMasked.size()>0){ - for(String content:listunMasked){ + if(listunMasked!=null) { + for(int i = 0; i < listunMasked.size(); i++) { listMasked.add(AppConstants.Masked_String); } } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8d694aa3/security-admin/src/main/java/org/apache/ranger/common/ServiceUtil.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/common/ServiceUtil.java b/security-admin/src/main/java/org/apache/ranger/common/ServiceUtil.java index 2b65796..7355e3d 100644 --- a/security-admin/src/main/java/org/apache/ranger/common/ServiceUtil.java +++ b/security-admin/src/main/java/org/apache/ranger/common/ServiceUtil.java @@ -1264,7 +1264,6 @@ public class ServiceUtil { if (vXPermObjList != null) { for(VXPermObj vXPermObj : vXPermObjList ) { boolean delegatedAdmin = false; - String ipAddress = null; if (vXPermObj.getUserList() != null ) { for (String user : vXPermObj.getUserList() ) { @@ -1296,10 +1295,6 @@ public class ServiceUtil { } } - if (vXPermObj.getIpAddress() != null) { - ipAddress = vXPermObj.getIpAddress(); - } - if (delegatedAdmin) { ret.setDelegateAdmin(Boolean.TRUE); } else { http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8d694aa3/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java b/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java index 587de2d..0d1e552 100644 --- a/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java +++ b/security-admin/src/main/java/org/apache/ranger/rest/ServiceREST.java @@ -2360,7 +2360,6 @@ public class ServiceREST { if (servicePolicies.getTagPolicies() != null) { policies = servicePolicies.getTagPolicies().getPolicies(); if (CollectionUtils.isNotEmpty(policies)) { - List<RangerPolicy> filteredPolicies = new ArrayList<RangerPolicy>(); for (RangerPolicy policy : policies) { if (!policy.getIsEnabled()) { containsDisabledTagPolicies = true; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8d694aa3/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerSecurityContextFormationFilter.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerSecurityContextFormationFilter.java b/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerSecurityContextFormationFilter.java index 2102768..7314782 100644 --- a/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerSecurityContextFormationFilter.java +++ b/security-admin/src/main/java/org/apache/ranger/security/web/filter/RangerSecurityContextFormationFilter.java @@ -94,7 +94,6 @@ public class RangerSecurityContextFormationFilter extends GenericFilterBean { // ignore } else { HttpServletRequest httpRequest = (HttpServletRequest) request; - String httpMethod=httpRequest.getMethod(); HttpSession httpSession = httpRequest.getSession(false); // [1]get the context from session http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8d694aa3/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 fbb53d2..839bf59 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 @@ -191,12 +191,9 @@ public class XResourceService extends MessageEnums.DATA_NOT_FOUND); } Long assetId = vObj.getAssetId(); - int assetType; if(assetId != null){ XXAsset xAsset = rangerDaoManager.getXXAsset().getById(assetId); - if(xAsset != null){ - assetType = xAsset.getAssetType(); - } else { + if(xAsset == null){ throw restErrorUtil.createRESTException("The repository for which " + "the policy is created, doesn't exist in the system.", MessageEnums.OPER_NOT_ALLOWED_FOR_STATE); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8d694aa3/security-admin/src/main/java/org/apache/ranger/service/XTrxLogService.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/XTrxLogService.java b/security-admin/src/main/java/org/apache/ranger/service/XTrxLogService.java index 5b61f71..f28ccca 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/XTrxLogService.java +++ b/security-admin/src/main/java/org/apache/ranger/service/XTrxLogService.java @@ -212,10 +212,8 @@ public class XTrxLogService extends XTrxLogServiceBase<XXTrxLog, VXTrxLog> { Root<VXXTrxLog> rootEntityType = criteriaQuery.from(klass); Metamodel entityMetaModel = em.getMetamodel(); EntityType<VXXTrxLog> entityType = entityMetaModel.entity(klass); - CriteriaQuery<VXXTrxLog> selectCQ = criteriaQuery.select(rootEntityType); Map<String, Object> paramList = searchCriteria.getParamList(); CriteriaQuery<Long> countCQ = criteriaBuilder.createQuery(Long.class); - Root<VXXTrxLog> countEntityType = countCQ.from(klass); Predicate predicate = criteriaBuilder.conjunction(); String fieldName=null; String clientFieldName =null; @@ -456,4 +454,4 @@ public class XTrxLogService extends XTrxLogServiceBase<XXTrxLog, VXTrxLog> { } return vObj; } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/8d694aa3/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormResourceMgr.java ---------------------------------------------------------------------- diff --git a/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormResourceMgr.java b/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormResourceMgr.java index bf9fea3..f682251 100644 --- a/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormResourceMgr.java +++ b/storm-agent/src/main/java/org/apache/ranger/services/storm/client/StormResourceMgr.java @@ -53,7 +53,6 @@ public class StormResourceMgr { public static List<String> getStormResources(String serviceName, Map<String, String> configs,ResourceLookupContext context) { String userInput = context.getUserInput(); - String resource = context.getResourceName(); Map<String, List<String>> resourceMap = context.getResources(); List<String> resultList = null; List<String> StormTopologyList = null;
