Repository: incubator-ranger Updated Branches: refs/heads/master 448dd49a6 -> b15d6fa8a
RANGER-1112 - Remove "Empty" PMD restrictions Signed-off-by: Selvamohan 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/b5611911 Tree: http://git-wip-us.apache.org/repos/asf/incubator-ranger/tree/b5611911 Diff: http://git-wip-us.apache.org/repos/asf/incubator-ranger/diff/b5611911 Branch: refs/heads/master Commit: b56119114cb989c44917dd7fc6d1d8da3b852632 Parents: 480776a Author: Colm O hEigeartaigh <[email protected]> Authored: Wed Aug 24 16:48:38 2016 +0100 Committer: Selvamohan Neethiraj <[email protected]> Committed: Mon Aug 29 09:22:22 2016 -0400 ---------------------------------------------------------------------- .../ranger/audit/provider/hdfs/HdfsLogDestination.java | 2 +- .../apache/ranger/admin/client/RangerAdminRESTClient.java | 8 ++------ .../apache/ranger/plugin/store/rest/ServiceRESTStore.java | 4 +--- dev-support/ranger-pmd-ruleset.xml | 3 --- .../org/apache/ranger/services/hbase/client/HBaseClient.java | 4 +--- .../org/apache/ranger/services/hdfs/client/HdfsClient.java | 4 +--- jisql/src/main/java/org/apache/util/sql/MySQLPLRunner.java | 8 ++------ .../org/apache/ranger/services/knox/client/KnoxClient.java | 4 ++-- .../kafka/authorizer/RangerKafkaAuthorizer.java | 2 +- .../src/main/java/org/apache/ranger/biz/SessionMgr.java | 2 +- .../src/main/java/org/apache/ranger/biz/UserMgr.java | 2 +- .../src/main/java/org/apache/ranger/common/SearchUtil.java | 2 +- .../src/main/java/org/apache/ranger/common/ServiceUtil.java | 5 +---- .../src/main/java/org/apache/ranger/rest/ServiceREST.java | 4 ---- .../web/authentication/RangerAuthFailureHandler.java | 4 ++-- .../web/filter/RangerSecurityContextFormationFilter.java | 4 +--- .../org/apache/ranger/service/RangerDataHistService.java | 2 +- .../apache/ranger/service/filter/RangerRESTAPIFilter.java | 7 +------ .../java/org/apache/ranger/solr/SolrAccessAuditsService.java | 4 ++-- .../src/main/java/org/apache/ranger/solr/SolrUtil.java | 2 +- .../apache/ranger/ldapconfigcheck/CommandLineOptions.java | 5 ++--- .../ranger/unixusersync/config/UserGroupSyncConfig.java | 2 +- .../unixusersync/process/PolicyMgrUserGroupBuilder.java | 3 --- 23 files changed, 26 insertions(+), 61 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/b5611911/agents-audit/src/main/java/org/apache/ranger/audit/provider/hdfs/HdfsLogDestination.java ---------------------------------------------------------------------- diff --git a/agents-audit/src/main/java/org/apache/ranger/audit/provider/hdfs/HdfsLogDestination.java b/agents-audit/src/main/java/org/apache/ranger/audit/provider/hdfs/HdfsLogDestination.java index 0951c64..f15b57a 100644 --- a/agents-audit/src/main/java/org/apache/ranger/audit/provider/hdfs/HdfsLogDestination.java +++ b/agents-audit/src/main/java/org/apache/ranger/audit/provider/hdfs/HdfsLogDestination.java @@ -471,7 +471,7 @@ public class HdfsLogDestination<T> implements LogDestination<T> { return; } - String excpMsgToExclude = EXCP_MSG_FILESYSTEM_CLOSED;; + String excpMsgToExclude = EXCP_MSG_FILESYSTEM_CLOSED; String excpMsg = excp != null ? excp.getMessage() : null; boolean excpExcludeLogging = (excpMsg != null && excpMsg.contains(excpMsgToExclude)); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/b5611911/agents-common/src/main/java/org/apache/ranger/admin/client/RangerAdminRESTClient.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/admin/client/RangerAdminRESTClient.java b/agents-common/src/main/java/org/apache/ranger/admin/client/RangerAdminRESTClient.java index 3975b18..5f8acfe 100644 --- a/agents-common/src/main/java/org/apache/ranger/admin/client/RangerAdminRESTClient.java +++ b/agents-common/src/main/java/org/apache/ranger/admin/client/RangerAdminRESTClient.java @@ -117,9 +117,7 @@ public class RangerAdminRESTClient implements RangerAdminClient { if(response != null && response.getStatus() == 200) { ret = response.getEntity(ServicePolicies.class); - } else if(response != null && response.getStatus() == 304) { - // no change - } else { + } else if(!(response != null && response.getStatus() == 304)) { RESTResponse resp = RESTResponse.fromClientResponse(response); LOG.error("Error getting policies. secureMode=" + isSecureMode + ", user=" + user + ", response=" + resp.toString() + ", serviceName=" + serviceName); @@ -278,9 +276,7 @@ public class RangerAdminRESTClient implements RangerAdminClient { if(response != null && response.getStatus() == 200) { ret = response.getEntity(ServiceTags.class); - } else if(response != null && response.getStatus() == 304) { - // no change - } else { + } else if(!(response != null && response.getStatus() == 304)) { RESTResponse resp = RESTResponse.fromClientResponse(response); LOG.error("Error getting taggedResources. secureMode=" + isSecureMode + ", user=" + user + ", response=" + resp.toString() + ", serviceName=" + serviceName http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/b5611911/agents-common/src/main/java/org/apache/ranger/plugin/store/rest/ServiceRESTStore.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/store/rest/ServiceRESTStore.java b/agents-common/src/main/java/org/apache/ranger/plugin/store/rest/ServiceRESTStore.java index 1cb2175..4a00d63 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/store/rest/ServiceRESTStore.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/store/rest/ServiceRESTStore.java @@ -599,9 +599,7 @@ public class ServiceRESTStore extends AbstractServiceStore { if(response != null && response.getStatus() == 200) { ret = response.getEntity(ServicePolicies.class); - } else if(response != null && response.getStatus() == 304) { - // no change - } else { + } else if(!(response != null && response.getStatus() == 304)) { RESTResponse resp = RESTResponse.fromClientResponse(response); throw new Exception(resp.getMessage()); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/b5611911/dev-support/ranger-pmd-ruleset.xml ---------------------------------------------------------------------- diff --git a/dev-support/ranger-pmd-ruleset.xml b/dev-support/ranger-pmd-ruleset.xml index b3cf4fd..dbd8ff0 100644 --- a/dev-support/ranger-pmd-ruleset.xml +++ b/dev-support/ranger-pmd-ruleset.xml @@ -46,9 +46,6 @@ </rule> <rule ref="rulesets/java/empty.xml"> <exclude name="EmptyCatchBlock" /> - <exclude name="EmptyIfStmt" /> - <exclude name="EmptyStatementNotInLoop" /> - <exclude name="EmptyWhileStmt" /> </rule> <rule ref="rulesets/java/migrating.xml" /> <rule ref="rulesets/java/unnecessary.xml"> http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/b5611911/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseClient.java ---------------------------------------------------------------------- diff --git a/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseClient.java b/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseClient.java index 443eb01..0e980b9 100644 --- a/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseClient.java +++ b/hbase-agent/src/main/java/org/apache/ranger/services/hbase/client/HBaseClient.java @@ -60,9 +60,7 @@ public class HBaseClient extends BaseClient { for (Map.Entry<String, String> entry: connectionProperties.entrySet()) { String key = entry.getKey(); String value = entry.getValue(); - if (rangerInternalPropertyKeys.contains(key)) { - // skip - } else { + if (!rangerInternalPropertyKeys.contains(key)) { conf.set(key, value); } } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/b5611911/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsClient.java ---------------------------------------------------------------------- diff --git a/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsClient.java b/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsClient.java index bfc2628..ecc406c 100644 --- a/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsClient.java +++ b/hdfs-agent/src/main/java/org/apache/ranger/services/hdfs/client/HdfsClient.java @@ -55,9 +55,7 @@ public class HdfsClient extends BaseClient { for (Map.Entry<String, String> entry: connectionProperties.entrySet()) { String key = entry.getKey(); String value = entry.getValue(); - if (rangerInternalPropertyKeys.contains(key)) { - // skip - } else { + if (!rangerInternalPropertyKeys.contains(key)) { conf.set(key, value); } } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/b5611911/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 b2eda30..58ab85b 100644 --- a/jisql/src/main/java/org/apache/util/sql/MySQLPLRunner.java +++ b/jisql/src/main/java/org/apache/util/sql/MySQLPLRunner.java @@ -135,13 +135,9 @@ public class MySQLPLRunner { } String trimmedLine = line.trim(); - if (trimmedLine.startsWith("--")) { + if (trimmedLine.length() < 1 || trimmedLine.startsWith("--") + || trimmedLine.startsWith("//")) { //NOPMD //println(trimmedLine); - } else if (trimmedLine.length() < 1 - || trimmedLine.startsWith("//")) { - // Do nothing - } else if (trimmedLine.length() < 1 - || trimmedLine.startsWith("--")) { // Do nothing } else if (!fullLineDelimiter && trimmedLine.endsWith(getDelimiter()) http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/b5611911/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxClient.java ---------------------------------------------------------------------- diff --git a/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxClient.java b/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxClient.java index 42b1941..b107459 100644 --- a/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxClient.java +++ b/knox-agent/src/main/java/org/apache/ranger/services/knox/client/KnoxClient.java @@ -91,7 +91,7 @@ public class KnoxClient { ClientResponse response = null; try { - client = Client.create();; + client = Client.create(); client.addFilter(new HTTPBasicAuthFilter(userName, decryptedPwd)); WebResource webResource = client.resource(knoxUrl); @@ -193,7 +193,7 @@ public class KnoxClient { ClientResponse response = null; try { - client = Client.create();; + client = Client.create(); client.addFilter(new HTTPBasicAuthFilter(userName, decryptedPwd)); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/b5611911/plugin-kafka/src/main/java/org/apache/ranger/authorization/kafka/authorizer/RangerKafkaAuthorizer.java ---------------------------------------------------------------------- diff --git a/plugin-kafka/src/main/java/org/apache/ranger/authorization/kafka/authorizer/RangerKafkaAuthorizer.java b/plugin-kafka/src/main/java/org/apache/ranger/authorization/kafka/authorizer/RangerKafkaAuthorizer.java index 452698b..0304e2b 100644 --- a/plugin-kafka/src/main/java/org/apache/ranger/authorization/kafka/authorizer/RangerKafkaAuthorizer.java +++ b/plugin-kafka/src/main/java/org/apache/ranger/authorization/kafka/authorizer/RangerKafkaAuthorizer.java @@ -177,7 +177,7 @@ public class RangerKafkaAuthorizer implements Authorizer { if (resource.resourceType().equals(Topic$.MODULE$)) { rangerResource.setValue(KEY_TOPIC, resource.name()); - } else if (resource.resourceType().equals(Cluster$.MODULE$)) { + } else if (resource.resourceType().equals(Cluster$.MODULE$)) { //NOPMD // CLUSTER should go as null // rangerResource.setValue(KEY_CLUSTER, resource.name()); } else if (resource.resourceType().equals(Group$.MODULE$)) { http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/b5611911/security-admin/src/main/java/org/apache/ranger/biz/SessionMgr.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/biz/SessionMgr.java b/security-admin/src/main/java/org/apache/ranger/biz/SessionMgr.java index f591eb4..4c77d01 100644 --- a/security-admin/src/main/java/org/apache/ranger/biz/SessionMgr.java +++ b/security-admin/src/main/java/org/apache/ranger/biz/SessionMgr.java @@ -161,7 +161,7 @@ public class SessionMgr { }else if (StringUtils.isEmpty(httpRequest.getRequestURI())){ gjAuthSession = storeAuthSession(gjAuthSession); session.setAttribute("auditLoginId", gjAuthSession.getId()); - }else{ + }else{ //NOPMD //do not log the details for download policy and tag } } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/b5611911/security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java b/security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java index 6c305c4..c27f357 100644 --- a/security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java +++ b/security-admin/src/main/java/org/apache/ranger/biz/UserMgr.java @@ -1154,7 +1154,7 @@ public class UserMgr { xXPortalUser = this.createUser(userProfile, RangerCommonEnums.STATUS_ENABLED); } - } else { + } else { //NOPMD /* * throw restErrorUtil .createRESTException( "The login id " + * loginId + http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/b5611911/security-admin/src/main/java/org/apache/ranger/common/SearchUtil.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/common/SearchUtil.java b/security-admin/src/main/java/org/apache/ranger/common/SearchUtil.java index a91eb72..df48d54 100644 --- a/security-admin/src/main/java/org/apache/ranger/common/SearchUtil.java +++ b/security-admin/src/main/java/org/apache/ranger/common/SearchUtil.java @@ -665,7 +665,7 @@ public class SearchUtil { if (searchCriteria.getNullParamList().contains( searchField.getClientFieldName()) || searchCriteria.getNotNullParamList().contains( - searchField.getClientFieldName())) { + searchField.getClientFieldName())) { //NOPMD // Already addressed while building where clause } else if (searchField.getDataType() == SearchField.DATA_TYPE.INT_LIST || isListValue http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/b5611911/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 dad1458..eb4ba2d 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 @@ -1226,10 +1226,7 @@ public class ServiceUtil { Integer assetType = toAssetType(serviceType); - if(assetType == null) { - // nothing to do - } - else if (assetType == RangerCommonEnums.ASSET_HIVE) { + if (assetType == RangerCommonEnums.ASSET_HIVE) { String database = StringUtils.isEmpty(vXPolicy.getDatabases()) ? "*" : vXPolicy.getDatabases(); String table = getTableOrUdf(vXPolicy); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/b5611911/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 784878e..90b146b 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 @@ -1113,8 +1113,6 @@ public class ServiceREST { LOG.error("processRevokeRequest processing failed"); throw new Exception("processRevokeRequest processing failed"); } - } else { - // nothing to revoke! } } catch(WebApplicationException excp) { throw excp; @@ -1193,8 +1191,6 @@ public class ServiceREST { LOG.error("processSecureRevokeRequest processing failed"); throw new Exception("processSecureRevokeRequest processing failed"); } - } else { - // nothing to revoke! } }else{ LOG.error("secureRevokeAccess(" + serviceName + ", " + revokeRequest + ") failed as User doesn't have permission to revoke Policy"); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/b5611911/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthFailureHandler.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthFailureHandler.java b/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthFailureHandler.java index 1859ebc..5c0738c 100644 --- a/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthFailureHandler.java +++ b/security-admin/src/main/java/org/apache/ranger/security/web/authentication/RangerAuthFailureHandler.java @@ -113,9 +113,9 @@ ExceptionMappingAuthenticationFailureHandler { if (logger.isDebugEnabled()) { logger.debug("Sending login failed response : " + jsonResp); } - } else { + }// else { // super.onAuthenticationFailure(request, response, exception); - } + //} } } http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/b5611911/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 f02b875..3763687 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 @@ -90,9 +90,7 @@ public class RangerSecurityContextFormationFilter extends GenericFilterBean { Authentication auth = SecurityContextHolder.getContext() .getAuthentication(); - if (auth instanceof AnonymousAuthenticationToken) { - // ignore - } else { + if (!(auth instanceof AnonymousAuthenticationToken)) { HttpServletRequest httpRequest = (HttpServletRequest) request; HttpSession httpSession = httpRequest.getSession(false); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/b5611911/security-admin/src/main/java/org/apache/ranger/service/RangerDataHistService.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/RangerDataHistService.java b/security-admin/src/main/java/org/apache/ranger/service/RangerDataHistService.java index 65ad5ad..e94bad4 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/RangerDataHistService.java +++ b/security-admin/src/main/java/org/apache/ranger/service/RangerDataHistService.java @@ -68,7 +68,7 @@ public class RangerDataHistService { String objectGuid = baseModelObj.getGuid(); Date currentDate = DateUtil.getUTCDate(); - XXDataHist xDataHist = new XXDataHist();; + XXDataHist xDataHist = new XXDataHist(); xDataHist.setObjectId(baseModelObj.getId()); xDataHist.setObjectGuid(objectGuid); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/b5611911/security-admin/src/main/java/org/apache/ranger/service/filter/RangerRESTAPIFilter.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/service/filter/RangerRESTAPIFilter.java b/security-admin/src/main/java/org/apache/ranger/service/filter/RangerRESTAPIFilter.java index 0e5bb08..2e7881e 100644 --- a/security-admin/src/main/java/org/apache/ranger/service/filter/RangerRESTAPIFilter.java +++ b/security-admin/src/main/java/org/apache/ranger/service/filter/RangerRESTAPIFilter.java @@ -120,12 +120,7 @@ public class RangerRESTAPIFilter extends LoggingFilter { ContainerResponse response) { if (logStdOut) { // If it is image, then don't call super - if (response.getMediaType() != null) { - // logger.info("DELETE ME: Response= mediaType=" - // + response.getMediaType() + ", getType()" - // + response.getMediaType().getType() + ", getSubType()=" - // + response.getMediaType().getSubtype()); - } else { + if (response.getMediaType() == null) { logger.info("DELETE ME: Response= mediaType is null"); } if (response.getMediaType() == null http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/b5611911/security-admin/src/main/java/org/apache/ranger/solr/SolrAccessAuditsService.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/solr/SolrAccessAuditsService.java b/security-admin/src/main/java/org/apache/ranger/solr/SolrAccessAuditsService.java index 322f442..d2255f2 100644 --- a/security-admin/src/main/java/org/apache/ranger/solr/SolrAccessAuditsService.java +++ b/security-admin/src/main/java/org/apache/ranger/solr/SolrAccessAuditsService.java @@ -215,10 +215,10 @@ public class SolrAccessAuditsService { accessAudit.setClientIP(value.toString()); } value = doc.getFieldValue("logType"); - if (value != null) { + //if (value != null) { // TODO: Need to see what logType maps to in UI // accessAudit.setAuditType(solrUtil.toInt(value)); - } + //} value = doc.getFieldValue("result"); if (value != null) { accessAudit.setAccessResult(solrUtil.toInt(value)); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/b5611911/security-admin/src/main/java/org/apache/ranger/solr/SolrUtil.java ---------------------------------------------------------------------- diff --git a/security-admin/src/main/java/org/apache/ranger/solr/SolrUtil.java b/security-admin/src/main/java/org/apache/ranger/solr/SolrUtil.java index e912cfb..b09a73b 100644 --- a/security-admin/src/main/java/org/apache/ranger/solr/SolrUtil.java +++ b/security-admin/src/main/java/org/apache/ranger/solr/SolrUtil.java @@ -122,7 +122,7 @@ public class SolrUtil { } else if (searchField.getSearchType() == SEARCH_TYPE.GREATER_EQUAL_THAN || searchField.getSearchType() == SEARCH_TYPE.GREATER_THAN || searchField.getSearchType() == SEARCH_TYPE.LESS_EQUAL_THAN - || searchField.getSearchType() == SEARCH_TYPE.LESS_THAN) { + || searchField.getSearchType() == SEARCH_TYPE.LESS_THAN) { //NOPMD // TODO: Need to handle range here } else { String fq = setField(fieldName, paramValue); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/b5611911/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/CommandLineOptions.java ---------------------------------------------------------------------- diff --git a/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/CommandLineOptions.java b/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/CommandLineOptions.java index 340acf0..2aedbee 100644 --- a/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/CommandLineOptions.java +++ b/ugsync/ldapconfigchecktool/ldapconfigcheck/src/main/java/org/apache/ranger/ldapconfigcheck/CommandLineOptions.java @@ -54,9 +54,8 @@ public class CommandLineOptions { CommandLineParser parser = new BasicParser(); try { CommandLine cmd = parser.parse(options, args); - if (cmd.hasOption("h")) { - - } + // if (cmd.hasOption("h")) { + //} if (cmd.hasOption("p")) { bindPassword = cmd.getOptionValue("p"); http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/b5611911/ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java ---------------------------------------------------------------------- diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java index 59463ca..9552041 100644 --- a/ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java +++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/config/UserGroupSyncConfig.java @@ -853,7 +853,7 @@ public class UserGroupSyncConfig { } regexPatterns.add(baseRegex); int i = 1; - String nextRegex = prop.getProperty(baseProperty + "." + i);; + String nextRegex = prop.getProperty(baseProperty + "." + i); while (nextRegex != null) { regexPatterns.add(nextRegex); i++; http://git-wip-us.apache.org/repos/asf/incubator-ranger/blob/b5611911/ugsync/src/main/java/org/apache/ranger/unixusersync/process/PolicyMgrUserGroupBuilder.java ---------------------------------------------------------------------- diff --git a/ugsync/src/main/java/org/apache/ranger/unixusersync/process/PolicyMgrUserGroupBuilder.java b/ugsync/src/main/java/org/apache/ranger/unixusersync/process/PolicyMgrUserGroupBuilder.java index 0c62b35..17faec1 100644 --- a/ugsync/src/main/java/org/apache/ranger/unixusersync/process/PolicyMgrUserGroupBuilder.java +++ b/ugsync/src/main/java/org/apache/ranger/unixusersync/process/PolicyMgrUserGroupBuilder.java @@ -191,9 +191,6 @@ public class PolicyMgrUserGroupBuilder implements UserGroupSink { buildUserList(); buildUserGroupLinkList() ; rebuildUserGroupMap() ; - if (LOG.isDebugEnabled()) { - // this.print(); - } } catch (Exception e) { LOG.error("Failed to build Group List : ", e); }
