Repository: ranger Updated Branches: refs/heads/master 74905128f -> 4e414fd89
- code cleanup in agents-common module : * use collection methods properly - addAll/removeAll/isEmpty, * string comparison methods * and simplify the conditions, when multiple ifs are used Change-Id: I6fb6d339dce941264265b4affef49935d0c6f4ef Signed-off-by: Colm O hEigeartaigh <cohei...@apache.org> Project: http://git-wip-us.apache.org/repos/asf/ranger/repo Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/ed152bc6 Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/ed152bc6 Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/ed152bc6 Branch: refs/heads/master Commit: ed152bc6d105d2c4d6e9967e7cc91a9035ffebe1 Parents: 7490512 Author: Zsombor Gegesy <gzsom...@gmail.com> Authored: Thu Feb 9 12:47:13 2017 +0100 Committer: Colm O hEigeartaigh <cohei...@apache.org> Committed: Mon Feb 13 12:09:26 2017 +0000 ---------------------------------------------------------------------- .../hadoop/security/SecureClientLogin.java | 10 ++-- .../admin/client/RangerAdminRESTClient.java | 12 ++--- .../config/RangerLegacyConfigBuilder.java | 36 ++++---------- .../ranger/authorization/utils/StringUtil.java | 18 ++----- .../plugin/audit/RangerDefaultAuditHandler.java | 6 +-- .../plugin/client/HadoopConfigHolder.java | 11 +++-- ...rHiveResourcesAccessedTogetherCondition.java | 5 +- ...veResourcesNotAccessedTogetherCondition.java | 5 +- .../RangerScriptExecutionContext.java | 2 +- .../RangerTimeOfDayMatcher.java | 12 ++--- .../RangerAbstractGeolocationProvider.java | 3 +- .../RangerFileBasedTagRetriever.java | 14 ++---- .../contextenricher/RangerTagEnricher.java | 12 ++--- .../plugin/geo/RangerGeolocationDatabase.java | 6 +-- .../apache/ranger/plugin/geo/ValuePrinter.java | 5 +- .../ranger/plugin/model/RangerPolicy.java | 48 +++++------------- .../ranger/plugin/model/RangerServiceDef.java | 52 +++++--------------- .../model/validation/RangerPolicyValidator.java | 6 ++- .../validation/RangerServiceDefHelper.java | 14 ++---- .../model/validation/RangerValidator.java | 2 +- .../policyengine/RangerPolicyEngineImpl.java | 2 +- .../policyengine/RangerResourceAccessInfo.java | 2 +- .../RangerAbstractPolicyItemEvaluator.java | 2 +- .../RangerDefaultPolicyEvaluator.java | 24 ++------- .../RangerOptimizedPolicyEvaluator.java | 8 +-- .../RangerDefaultPolicyResourceMatcher.java | 15 ++---- .../RangerAbstractResourceMatcher.java | 4 +- .../RangerPathResourceMatcher.java | 4 +- .../plugin/store/AbstractPredicateUtil.java | 4 +- .../plugin/store/AbstractServiceStore.java | 2 +- .../plugin/store/EmbeddedServiceDefsUtil.java | 4 +- .../plugin/util/RangerAccessRequestUtil.java | 8 +-- .../plugin/util/RangerRequestedResources.java | 10 +--- .../ranger/plugin/util/RangerResourceTrie.java | 2 +- .../ranger/services/tag/RangerServiceTag.java | 4 +- .../conditionevaluator/RangerIpMatcherTest.java | 3 +- .../conditionevaluator/RangerSimpleMatcher.java | 4 +- .../model/validation/TestRangerValidator.java | 7 +-- 38 files changed, 121 insertions(+), 267 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/ranger/blob/ed152bc6/agents-common/src/main/java/org/apache/hadoop/security/SecureClientLogin.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/hadoop/security/SecureClientLogin.java b/agents-common/src/main/java/org/apache/hadoop/security/SecureClientLogin.java index e8516cd..3949350 100644 --- a/agents-common/src/main/java/org/apache/hadoop/security/SecureClientLogin.java +++ b/agents-common/src/main/java/org/apache/hadoop/security/SecureClientLogin.java @@ -94,10 +94,8 @@ public class SecureClientLogin { if (aSubject != null) { Set<User> list = aSubject.getPrincipals(User.class); if (list != null) { - Set<Principal> ret = new HashSet<Principal>(); - for (User a : list) { - ret.add(a); - } + Set<Principal> ret = new HashSet<>(); + ret.addAll(list); return ret; } else { return null; @@ -134,7 +132,7 @@ public class SecureClientLogin { public static String getPrincipal(String principalConfig, String hostName) throws IOException { String[] components = getComponents(principalConfig); - if (components == null || components.length != 3 || !components[1].equals(HOSTNAME_PATTERN)) { + if (components == null || components.length != 3 || !HOSTNAME_PATTERN.equals(components[1])) { return principalConfig; } else { if (hostName == null) { @@ -153,7 +151,7 @@ public class SecureClientLogin { private static String replacePattern(String[] components, String hostname) throws IOException { String fqdn = hostname; - if (fqdn == null || fqdn.isEmpty() || fqdn.equals("0.0.0.0")) { + if (fqdn == null || fqdn.isEmpty() || "0.0.0.0".equals(fqdn)) { fqdn = java.net.InetAddress.getLocalHost().getCanonicalHostName(); } return components[0] + "/" + StringUtils.toLowerCase(fqdn) + "@" + components[2]; http://git-wip-us.apache.org/repos/asf/ranger/blob/ed152bc6/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 4966a78..9334607 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 @@ -129,7 +129,7 @@ public class RangerAdminRESTClient implements RangerAdminClient { } else { RESTResponse resp = RESTResponse.fromClientResponse(response); if (LOG.isDebugEnabled()) { - LOG.debug("No change in policies. secureMode=" + isSecureMode + ", user=" + user + ", response=" + resp.toString() + ", serviceName=" + serviceName); + LOG.debug("No change in policies. secureMode=" + isSecureMode + ", user=" + user + ", response=" + resp + ", serviceName=" + serviceName); } } ret = null; @@ -147,7 +147,7 @@ public class RangerAdminRESTClient implements RangerAdminClient { LOG.warn("Received 404 error code with body:[" + exceptionMsg + "], Ignoring"); } else { RESTResponse resp = RESTResponse.fromClientResponse(response); - LOG.warn("Error getting policies. secureMode=" + isSecureMode + ", user=" + user + ", response=" + resp.toString() + ", serviceName=" + serviceName); + LOG.warn("Error getting policies. secureMode=" + isSecureMode + ", user=" + user + ", response=" + resp + ", serviceName=" + serviceName); ret = null; } @@ -310,7 +310,7 @@ public class RangerAdminRESTClient implements RangerAdminClient { RESTResponse resp = RESTResponse.fromClientResponse(response); if (LOG.isDebugEnabled()) { LOG.debug("No change in tags. secureMode=" + isSecureMode + ", user=" + user - + ", response=" + resp.toString() + ", serviceName=" + serviceName + + ", response=" + resp + ", serviceName=" + serviceName + ", " + "lastKnownVersion=" + lastKnownVersion + ", " + "lastActivationTimeInMillis=" + lastActivationTimeInMillis); } @@ -330,7 +330,7 @@ public class RangerAdminRESTClient implements RangerAdminClient { LOG.warn("Received 404 error code with body:[" + exceptionMsg + "], Ignoring"); } else { RESTResponse resp = RESTResponse.fromClientResponse(response); - LOG.warn("Error getting tags. secureMode=" + isSecureMode + ", user=" + user + ", response=" + resp.toString() + ", serviceName=" + serviceName); + LOG.warn("Error getting tags. secureMode=" + isSecureMode + ", user=" + user + ", response=" + resp + ", serviceName=" + serviceName); ret = null; } @@ -375,8 +375,8 @@ public class RangerAdminRESTClient implements RangerAdminClient { ret = response.getEntity(getGenericType(emptyString)); } else { RESTResponse resp = RESTResponse.fromClientResponse(response); - LOG.error("Error getting tags. request=" + webResource.toString() - + ", response=" + resp.toString() + ", serviceName=" + serviceName + LOG.error("Error getting tags. request=" + webResource + + ", response=" + resp + ", serviceName=" + serviceName + ", " + "pattern=" + pattern); throw new Exception(resp.getMessage()); } http://git-wip-us.apache.org/repos/asf/ranger/blob/ed152bc6/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerLegacyConfigBuilder.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerLegacyConfigBuilder.java b/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerLegacyConfigBuilder.java index 2d1a56c..8b6382c 100644 --- a/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerLegacyConfigBuilder.java +++ b/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerLegacyConfigBuilder.java @@ -134,11 +134,10 @@ public class RangerLegacyConfigBuilder { } public static Configuration buildRangerSecurityConf(String serviceType) { - Configuration rangerConf = new Configuration(); rangerConf.set(getPropertyName(RangerConfigConstants.RANGER_SERVICE_NAME,serviceType),""); - if (serviceType.equals(EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_KNOX_NAME) ) { + if (EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_KNOX_NAME.equals(serviceType) ) { rangerConf.set(getPropertyName(RangerConfigConstants.RANGER_PLUGIN_POLICY_SOURCE_IMPL,serviceType),RangerConfigConstants.RANGER_KNOX_PLUGIN_POLICY_SOURCE_IMPL_DEFAULT); } else { rangerConf.set(getPropertyName(RangerConfigConstants.RANGER_PLUGIN_POLICY_SOURCE_IMPL,serviceType),""); @@ -165,14 +164,13 @@ public class RangerLegacyConfigBuilder { changeMap.put(getPropertyName(RangerConfigConstants.XASECURE_POLICYMGR_URL_LASTSTOREDFILE,serviceType), getPropertyName(RangerConfigConstants.RANGER_PLUGIN_POLICY_CACHE_DIR,serviceType)); - - if (serviceType.equals(EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_HDFS_NAME)) { + if (EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_HDFS_NAME.equals(serviceType)) { changeMap.put(RangerConfigConstants.XASECURE_ADD_HADDOP_AUTHORZATION, RangerConfigConstants.RANGER_PLUGIN_ADD_HADDOOP_AUTHORIZATION); } - if (serviceType.equals(EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_HBASE_NAME) || - serviceType.equals(EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_HIVE_NAME)) { + if (EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_HBASE_NAME.equals(serviceType) || + EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_HIVE_NAME.equals(serviceType)) { changeMap.put(getPropertyName(RangerConfigConstants.XASECURE_UPDATE_XAPOLICIES_ON_GRANT,serviceType), getPropertyName(RangerConfigConstants.XASECURE_UPDATE_XAPOLICIES_ON_GRANT,serviceType)); } @@ -202,46 +200,30 @@ public class RangerLegacyConfigBuilder { } public static URL getFileURL(String fileName) { - URL lurl = RangerLegacyConfigBuilder.class.getClassLoader().getResource(fileName); - return lurl; + return RangerLegacyConfigBuilder.class.getClassLoader().getResource(fileName); } public static String getPropertyName(String rangerProp, String serviceType) { - - String ret = rangerProp.replace("<ServiceType>", serviceType); - - return ret; + return rangerProp.replace("<ServiceType>", serviceType); } public static String getPolicyMgrURL(String url) { - String ret = null; - int index = url.indexOf("/",url.lastIndexOf(":")); - ret = url.substring(0,index); - - return ret; + return url.substring(0,index); } public static String getServiceNameFromURL(String url) { - String ret = null; - int index = url.lastIndexOf("/"); - ret = url.substring(index+1); - - return ret; + return url.substring(index+1); } public static String getCacheFileURL(String cacheFile) { - String ret = null; - int index = cacheFile.lastIndexOf("/"); - ret = cacheFile.substring(0,index); - - return ret; + return cacheFile.substring(0,index); } public static String fetchLegacyValue(String legacyVal, String rangerKey) { http://git-wip-us.apache.org/repos/asf/ranger/blob/ed152bc6/agents-common/src/main/java/org/apache/ranger/authorization/utils/StringUtil.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/authorization/utils/StringUtil.java b/agents-common/src/main/java/org/apache/ranger/authorization/utils/StringUtil.java index 57570c2..2835cdd 100644 --- a/agents-common/src/main/java/org/apache/ranger/authorization/utils/StringUtil.java +++ b/agents-common/src/main/java/org/apache/ranger/authorization/utils/StringUtil.java @@ -152,23 +152,11 @@ public class StringUtil { */ public static boolean contains(String str, String strToFind) { - boolean ret = false; - - if(str != null && strToFind != null) { - ret = str.contains(strToFind); - } - - return ret; + return str != null && strToFind != null && str.contains(strToFind); } public static boolean containsIgnoreCase(String str, String strToFind) { - boolean ret = false; - - if(str != null && strToFind != null) { - ret = str.toLowerCase().contains(strToFind.toLowerCase()); - } - - return ret; + return str != null && strToFind != null && str.toLowerCase().contains(strToFind.toLowerCase()); } public static boolean contains(String[] strArr, String str) { @@ -236,7 +224,7 @@ public class StringUtil { public static String toString(List<String> arr) { String ret = ""; - if(arr != null && arr.size() > 0) { + if(arr != null && !arr.isEmpty()) { ret = arr.get(0); for(int i = 1; i < arr.size(); i++) { ret += (", " + arr.get(i)); http://git-wip-us.apache.org/repos/asf/ranger/blob/ed152bc6/agents-common/src/main/java/org/apache/ranger/plugin/audit/RangerDefaultAuditHandler.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/audit/RangerDefaultAuditHandler.java b/agents-common/src/main/java/org/apache/ranger/plugin/audit/RangerDefaultAuditHandler.java index b7a6f6e..b2a7a6c 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/audit/RangerDefaultAuditHandler.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/audit/RangerDefaultAuditHandler.java @@ -248,12 +248,10 @@ public class RangerDefaultAuditHandler implements RangerAccessResultProcessor { if(nextId == Integer.MAX_VALUE) { // reset UUID and counter - RangerDefaultAuditHandler.UUID = MiscUtil.generateUniqueId(); + UUID = MiscUtil.generateUniqueId(); counter = new AtomicInteger(0); } - String ret = RangerDefaultAuditHandler.UUID + "-" + Integer.toString(nextId); - - return ret; + return UUID + "-" + nextId; } } http://git-wip-us.apache.org/repos/asf/ranger/blob/ed152bc6/agents-common/src/main/java/org/apache/ranger/plugin/client/HadoopConfigHolder.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/client/HadoopConfigHolder.java b/agents-common/src/main/java/org/apache/ranger/plugin/client/HadoopConfigHolder.java index bd7d770..54039a7 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/client/HadoopConfigHolder.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/client/HadoopConfigHolder.java @@ -140,14 +140,14 @@ public class HadoopConfigHolder { } private void initConnectionProp() { - for(String key : connectionProperties.keySet()) { - + for(Map.Entry<String,String> entry : connectionProperties.entrySet()) { + String key = entry.getKey(); String resourceName = getResourceName(key); if (resourceName == null) { resourceName = RANGER_SECTION_NAME; } - String val = connectionProperties.get(key); + String val = entry.getValue(); addConfiguration(datasourceName, resourceName, key, val ); } } @@ -226,8 +226,9 @@ public class HadoopConfigHolder { } } - if (prop.size() == 0) + if (prop.isEmpty()) { return; + } for(Object keyobj : prop.keySet()) { String key = (String)keyobj; @@ -296,7 +297,7 @@ public class HadoopConfigHolder { String hadoopSecurityAuthenticationn = getHadoopSecurityAuthentication(); if ( hadoopSecurityAuthenticationn != null) { - isKerberosAuth = ( hadoopSecurityAuthenticationn.equalsIgnoreCase(HADOOP_SECURITY_AUTHENTICATION_METHOD)); + isKerberosAuth = HADOOP_SECURITY_AUTHENTICATION_METHOD.equalsIgnoreCase(hadoopSecurityAuthenticationn); } else { isKerberosAuth = (((userName != null) && (userName.indexOf("@") > -1)) || (SecureClientLogin.isKerberosCredentialExists(lookupPrincipal, lookupKeytab))); http://git-wip-us.apache.org/repos/asf/ranger/blob/ed152bc6/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerHiveResourcesAccessedTogetherCondition.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerHiveResourcesAccessedTogetherCondition.java b/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerHiveResourcesAccessedTogetherCondition.java index 598cd0c..960efbe 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerHiveResourcesAccessedTogetherCondition.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerHiveResourcesAccessedTogetherCondition.java @@ -72,7 +72,7 @@ public class RangerHiveResourcesAccessedTogetherCondition extends RangerAbstract if (isInitialized && CollectionUtils.isNotEmpty(matchers)) { RangerRequestedResources resources = RangerAccessRequestUtil.getRequestedResourcesFromContext(request.getContext()); - ret = resources == null ? false : !resources.isMutuallyExcluded(matchers, request.getContext()); + ret = resources != null && !resources.isMutuallyExcluded(matchers, request.getContext()); } else { LOG.error("RangerHiveResourcesAccessedTogetherCondition.isMatched() - condition is not initialized correctly and will NOT be enforced"); } @@ -131,8 +131,7 @@ public class RangerHiveResourcesAccessedTogetherCondition extends RangerAbstract } // Works only for Hive serviceDef for now - if (serviceDef != null && serviceDef.getName().equals(EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_HIVE_NAME)) { - + if (serviceDef != null && EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_HIVE_NAME.equals(serviceDef.getName())) { //Parse policyResourceSpec char separator = '.'; String any = "*"; http://git-wip-us.apache.org/repos/asf/ranger/blob/ed152bc6/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerHiveResourcesNotAccessedTogetherCondition.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerHiveResourcesNotAccessedTogetherCondition.java b/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerHiveResourcesNotAccessedTogetherCondition.java index a166fe1..fb2ba2e 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerHiveResourcesNotAccessedTogetherCondition.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerHiveResourcesNotAccessedTogetherCondition.java @@ -72,7 +72,7 @@ public class RangerHiveResourcesNotAccessedTogetherCondition extends RangerAbstr if (isInitialized && CollectionUtils.isNotEmpty(matchers)) { RangerRequestedResources resources = RangerAccessRequestUtil.getRequestedResourcesFromContext(request.getContext()); - ret = resources == null ? true : resources.isMutuallyExcluded(matchers, request.getContext()); + ret = resources == null || resources.isMutuallyExcluded(matchers, request.getContext()); } else { LOG.error("RangerHiveResourcesNotAccessedTogetherCondition.isMatched() - Enforcer is not initialized correctly, Mutual Exclusion will NOT be enforced"); } @@ -131,8 +131,7 @@ public class RangerHiveResourcesNotAccessedTogetherCondition extends RangerAbstr } // Works only for Hive serviceDef for now - if (serviceDef != null && serviceDef.getName().equals(EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_HIVE_NAME)) { - + if (serviceDef != null && EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_HIVE_NAME.equals(serviceDef.getName())) { //Parse policyResourceSpec char separator = '.'; String any = "*"; http://git-wip-us.apache.org/repos/asf/ranger/blob/ed152bc6/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 b8ee2f3..923c188 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 @@ -100,7 +100,7 @@ public final class RangerScriptExecutionContext { RangerTagForEval ret = null; Object val = getRequestContext().get(RangerAccessRequestUtil.KEY_CONTEXT_TAG_OBJECT); - if(val != null && val instanceof RangerTagForEval) { + if(val instanceof RangerTagForEval) { ret = (RangerTagForEval)val; } else { if (LOG.isDebugEnabled()) { http://git-wip-us.apache.org/repos/asf/ranger/blob/ed152bc6/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerTimeOfDayMatcher.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerTimeOfDayMatcher.java b/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerTimeOfDayMatcher.java index b561142..aa8f9c6 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerTimeOfDayMatcher.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerTimeOfDayMatcher.java @@ -106,18 +106,18 @@ public class RangerTimeOfDayMatcher extends RangerAbstractConditionEvaluator { } String endType = m.group(8).toUpperCase(); if(startHour == 12) { - if(startType.equals("A")) { + if("A".equals(startType)) { startHour = 0; } - } else if (startType.equals("P")) { + } else if ("P".equals(startType)) { startHour += 12; } if(endHour == 12) { - if(endType.equals("A")) { + if("A".equals(endType)) { endHour = 0; } - } else if (endType.equals("P")) { + } else if ("P".equals(endType)) { endHour += 12; } @@ -190,10 +190,10 @@ public class RangerTimeOfDayMatcher extends RangerAbstractConditionEvaluator { StringBuilder sb = new StringBuilder(); sb.append("RangerTimeOfDayMatcher {"); - sb.append("_allowAny=" + _allowAny).append(" "); + sb.append("_allowAny=").append(_allowAny).append(" "); sb.append("_durations=["); for(int[] duration : _durations) { - sb.append("{start=" + duration[0] + "; end=" + duration[1] + "} "); + sb.append("{start=").append(duration[0]).append("; end=").append(duration[1]).append("} "); } sb.append("]"); sb.append("}"); http://git-wip-us.apache.org/repos/asf/ranger/blob/ed152bc6/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerAbstractGeolocationProvider.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerAbstractGeolocationProvider.java b/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerAbstractGeolocationProvider.java index 0f681f8..d6a0412 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerAbstractGeolocationProvider.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerAbstractGeolocationProvider.java @@ -114,12 +114,11 @@ public abstract class RangerAbstractGeolocationProvider extends RangerAbstractCo } if (StringUtils.isNotBlank(clientIPAddress) && store != null) { - geolocation = store.getGeoLocation(clientIPAddress); if (geolocation != null) { if (LOG.isDebugEnabled()) { - LOG.debug("RangerAbstractGeolocationProvider.enrich() - Country=" + geolocation.toString()); + LOG.debug("RangerAbstractGeolocationProvider.enrich() - Country=" + geolocation); } Map<String, Object> context = request.getContext(); http://git-wip-us.apache.org/repos/asf/ranger/blob/ed152bc6/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerFileBasedTagRetriever.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerFileBasedTagRetriever.java b/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerFileBasedTagRetriever.java index 031a59f..b858879 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerFileBasedTagRetriever.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerFileBasedTagRetriever.java @@ -76,25 +76,19 @@ public class RangerFileBasedTagRetriever extends RangerTagRetriever { LOG.error("Error processing input file:" + serviceTagsFileName + " cannot be converted to URL " + serviceTagsFileName, malformedException); } } else { - URL fileURL = getClass().getResource(serviceTagsFileName); - if (fileURL == null) { - if (!serviceTagsFileName.startsWith("/")) { - fileURL = getClass().getResource("/" + serviceTagsFileName); - } + if (fileURL == null && !serviceTagsFileName.startsWith("/")) { + fileURL = getClass().getResource("/" + serviceTagsFileName); } if (fileURL == null) { fileURL = ClassLoader.getSystemClassLoader().getResource(serviceTagsFileName); - if (fileURL == null) { - if (!serviceTagsFileName.startsWith("/")) { - fileURL = ClassLoader.getSystemClassLoader().getResource("/" + serviceTagsFileName); - } + if (fileURL == null && !serviceTagsFileName.startsWith("/")) { + fileURL = ClassLoader.getSystemClassLoader().getResource("/" + serviceTagsFileName); } } if (fileURL != null) { - try { serviceTagsFileStream = fileURL.openStream(); serviceTagsFileURL = fileURL; http://git-wip-us.apache.org/repos/asf/ranger/blob/ed152bc6/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerTagEnricher.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerTagEnricher.java b/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerTagEnricher.java index ec10524..f6638ba 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerTagEnricher.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/contextenricher/RangerTagEnricher.java @@ -227,7 +227,7 @@ public class RangerTagEnricher extends RangerAbstractContextEnricher { RangerAccessResource resource = request.getResource(); - if ((resource == null || resource.getKeys() == null || resource.getKeys().size() == 0) && request.isAccessTypeAny()) { + if ((resource == null || resource.getKeys() == null || resource.getKeys().isEmpty()) && request.isAccessTypeAny()) { ret = enrichedServiceTags.getTagsForEmptyResourceAndAnyAccess(); } else { @@ -283,7 +283,7 @@ public class RangerTagEnricher extends RangerAbstractContextEnricher { final List<RangerServiceResourceMatcher> serviceResourceMatchers = enrichedServiceTags.getServiceResourceMatchers(); final Map<String, RangerResourceTrie<RangerServiceResourceMatcher>> serviceResourceTrie = enrichedServiceTags.getServiceResourceTrie(); - if (resource == null || resource.getKeys() == null || resource.getKeys().size() == 0 || serviceResourceTrie == null) { + if (resource == null || resource.getKeys() == null || resource.getKeys().isEmpty() || serviceResourceTrie == null) { ret = serviceResourceMatchers; } else { Set<String> resourceKeys = resource.getKeys(); @@ -568,12 +568,10 @@ public class RangerTagEnricher extends RangerAbstractContextEnricher { serviceTags = gson.fromJson(reader, ServiceTags.class); - if (serviceTags != null) { - if (!StringUtils.equals(tagEnricher.getServiceName(), serviceTags.getServiceName())) { - LOG.warn("ignoring unexpected serviceName '" + serviceTags.getServiceName() + "' in cache file '" + cacheFile.getAbsolutePath() + "'"); + if (serviceTags != null && !StringUtils.equals(tagEnricher.getServiceName(), serviceTags.getServiceName())) { + LOG.warn("ignoring unexpected serviceName '" + serviceTags.getServiceName() + "' in cache file '" + cacheFile.getAbsolutePath() + "'"); - serviceTags.setServiceName(tagEnricher.getServiceName()); - } + serviceTags.setServiceName(tagEnricher.getServiceName()); } } catch (Exception excp) { LOG.error("failed to load service-tags from cache file " + cacheFile.getAbsolutePath(), excp); http://git-wip-us.apache.org/repos/asf/ranger/blob/ed152bc6/agents-common/src/main/java/org/apache/ranger/plugin/geo/RangerGeolocationDatabase.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/geo/RangerGeolocationDatabase.java b/agents-common/src/main/java/org/apache/ranger/plugin/geo/RangerGeolocationDatabase.java index e4a7dcc..98c55cc 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/geo/RangerGeolocationDatabase.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/geo/RangerGeolocationDatabase.java @@ -55,10 +55,8 @@ public class RangerGeolocationDatabase { public RangerGeolocationData find(final String ipAddressStr) { RangerGeolocationData ret = null; - if (StringUtils.isNotBlank(ipAddressStr)) { - if (RangerGeolocationData.validateAsIP(ipAddressStr, true)) { - ret = data.find(RangerGeolocationData.ipAddressToLong(ipAddressStr)); - } + if (StringUtils.isNotBlank(ipAddressStr) && RangerGeolocationData.validateAsIP(ipAddressStr, true)) { + ret = data.find(RangerGeolocationData.ipAddressToLong(ipAddressStr)); } return ret; } http://git-wip-us.apache.org/repos/asf/ranger/blob/ed152bc6/agents-common/src/main/java/org/apache/ranger/plugin/geo/ValuePrinter.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/geo/ValuePrinter.java b/agents-common/src/main/java/org/apache/ranger/plugin/geo/ValuePrinter.java index 62d6891..89bb0b4 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/geo/ValuePrinter.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/geo/ValuePrinter.java @@ -39,14 +39,13 @@ class ValuePrinter<T> implements ValueProcessor<T> { if (value != null) { if (writer == null) { - LOG.error("ValuePrinter.process() -" + value.toString()); + LOG.error("ValuePrinter.process() -" + value); } else { try { writer.write(value.toString()); writer.write('\n'); } catch (IOException exception) { - LOG.error("ValuePrinter.process() - Cannot write '" + value.toString() + "' to " + fileName); - + LOG.error("ValuePrinter.process() - Cannot write '" + value + "' to " + fileName); } } } http://git-wip-us.apache.org/repos/asf/ranger/blob/ed152bc6/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicy.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicy.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicy.java index 40667ee..19475aa 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicy.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicy.java @@ -261,9 +261,7 @@ public class RangerPolicy extends RangerBaseModelObject implements java.io.Seria this.policyItems.clear(); if(policyItems != null) { - for(RangerPolicyItem policyItem : policyItems) { - this.policyItems.add(policyItem); - } + this.policyItems.addAll(policyItems); } } @@ -289,9 +287,7 @@ public class RangerPolicy extends RangerBaseModelObject implements java.io.Seria this.denyPolicyItems.clear(); if(denyPolicyItems != null) { - for(RangerPolicyItem policyItem : denyPolicyItems) { - this.denyPolicyItems.add(policyItem); - } + this.denyPolicyItems.addAll(denyPolicyItems); } } @@ -317,9 +313,7 @@ public class RangerPolicy extends RangerBaseModelObject implements java.io.Seria this.allowExceptions.clear(); if(allowExceptions != null) { - for(RangerPolicyItem policyItem : allowExceptions) { - this.allowExceptions.add(policyItem); - } + this.allowExceptions.addAll(allowExceptions); } } @@ -345,9 +339,7 @@ public class RangerPolicy extends RangerBaseModelObject implements java.io.Seria this.denyExceptions.clear(); if(denyExceptions != null) { - for(RangerPolicyItem policyItem : denyExceptions) { - this.denyExceptions.add(policyItem); - } + this.denyExceptions.addAll(denyExceptions); } } @@ -367,9 +359,7 @@ public class RangerPolicy extends RangerBaseModelObject implements java.io.Seria this.dataMaskPolicyItems.clear(); if(dataMaskPolicyItems != null) { - for(RangerDataMaskPolicyItem dataMaskPolicyItem : dataMaskPolicyItems) { - this.dataMaskPolicyItems.add(dataMaskPolicyItem); - } + this.dataMaskPolicyItems.addAll(dataMaskPolicyItems); } } @@ -389,9 +379,7 @@ public class RangerPolicy extends RangerBaseModelObject implements java.io.Seria this.rowFilterPolicyItems.clear(); if(rowFilterPolicyItems != null) { - for(RangerRowFilterPolicyItem rowFilterPolicyItem : rowFilterPolicyItems) { - this.rowFilterPolicyItems.add(rowFilterPolicyItem); - } + this.rowFilterPolicyItems.addAll(rowFilterPolicyItems); } } @@ -548,9 +536,7 @@ public class RangerPolicy extends RangerBaseModelObject implements java.io.Seria this.values.clear(); if(values != null) { - for(String value : values) { - this.values.add(value); - } + this.values.addAll(values); } } @@ -709,9 +695,7 @@ public class RangerPolicy extends RangerBaseModelObject implements java.io.Seria this.accesses.clear(); if(accesses != null) { - for(RangerPolicyItemAccess access : accesses) { - this.accesses.add(access); - } + this.accesses.addAll(accesses); } } /** @@ -735,9 +719,7 @@ public class RangerPolicy extends RangerBaseModelObject implements java.io.Seria this.users.clear(); if(users != null) { - for(String user : users) { - this.users.add(user); - } + this.users.addAll(users); } } /** @@ -761,9 +743,7 @@ public class RangerPolicy extends RangerBaseModelObject implements java.io.Seria this.groups.clear(); if(groups != null) { - for(String group : groups) { - this.groups.add(group); - } + this.groups.addAll(groups); } } /** @@ -787,9 +767,7 @@ public class RangerPolicy extends RangerBaseModelObject implements java.io.Seria this.conditions.clear(); if(conditions != null) { - for(RangerPolicyItemCondition condition : conditions) { - this.conditions.add(condition); - } + this.conditions.addAll(conditions); } } @@ -1254,9 +1232,7 @@ public class RangerPolicy extends RangerBaseModelObject implements java.io.Seria this.values.clear(); if(values != null) { - for(String value : values) { - this.values.add(value); - } + this.values.addAll(values); } } http://git-wip-us.apache.org/repos/asf/ranger/blob/ed152bc6/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerServiceDef.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerServiceDef.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerServiceDef.java index b3e0964..7b3bd95 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerServiceDef.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerServiceDef.java @@ -226,9 +226,7 @@ public class RangerServiceDef extends RangerBaseModelObject implements java.io.S this.configs.clear(); if(configs != null) { - for(RangerServiceConfigDef config : configs) { - this.configs.add(config); - } + this.configs.addAll(configs); } } @@ -280,9 +278,7 @@ public class RangerServiceDef extends RangerBaseModelObject implements java.io.S this.resources.clear(); if(resources != null) { - for(RangerResourceDef resource : resources) { - this.resources.add(resource); - } + this.resources.addAll(resources); } } @@ -308,9 +304,7 @@ public class RangerServiceDef extends RangerBaseModelObject implements java.io.S this.accessTypes.clear(); if(accessTypes != null) { - for(RangerAccessTypeDef accessType : accessTypes) { - this.accessTypes.add(accessType); - } + this.accessTypes.addAll(accessTypes); } } @@ -336,9 +330,7 @@ public class RangerServiceDef extends RangerBaseModelObject implements java.io.S this.policyConditions.clear(); if(policyConditions != null) { - for(RangerPolicyConditionDef policyCondition : policyConditions) { - this.policyConditions.add(policyCondition); - } + this.policyConditions.addAll(policyConditions); } } @@ -364,9 +356,7 @@ public class RangerServiceDef extends RangerBaseModelObject implements java.io.S this.contextEnrichers.clear(); if(contextEnrichers != null) { - for(RangerContextEnricherDef contextEnricher : contextEnrichers) { - this.contextEnrichers.add(contextEnricher); - } + this.contextEnrichers.addAll(contextEnrichers); } } @@ -392,9 +382,7 @@ public class RangerServiceDef extends RangerBaseModelObject implements java.io.S this.enums.clear(); if(enums != null) { - for(RangerEnumDef enum1 : enums) { - this.enums.add(enum1); - } + this.enums.addAll(enums); } } @@ -595,9 +583,7 @@ public class RangerServiceDef extends RangerBaseModelObject implements java.io.S this.elements.clear(); if(elements != null) { - for(RangerEnumElementDef element : elements) { - this.elements.add(element); - } + this.elements.addAll(elements); } } @@ -1877,9 +1863,7 @@ public class RangerServiceDef extends RangerBaseModelObject implements java.io.S this.impliedGrants.clear(); if(impliedGrants != null) { - for(String impliedGrant : impliedGrants) { - this.impliedGrants.add(impliedGrant); - } + this.impliedGrants.addAll(impliedGrants); } } @@ -2522,9 +2506,7 @@ public class RangerServiceDef extends RangerBaseModelObject implements java.io.S this.maskTypes.clear(); if(maskTypes != null) { - for(RangerDataMaskTypeDef maskType : maskTypes) { - this.maskTypes.add(maskType); - } + this.maskTypes.addAll(maskTypes); } } @@ -2544,9 +2526,7 @@ public class RangerServiceDef extends RangerBaseModelObject implements java.io.S this.accessTypes.clear(); if(accessTypes != null) { - for(RangerAccessTypeDef accessType : accessTypes) { - this.accessTypes.add(accessType); - } + this.accessTypes.addAll(accessTypes); } } @@ -2566,9 +2546,7 @@ public class RangerServiceDef extends RangerBaseModelObject implements java.io.S this.resources.clear(); if(resources != null) { - for(RangerResourceDef resource : resources) { - this.resources.add(resource); - } + this.resources.addAll(resources); } } @@ -2933,9 +2911,7 @@ public class RangerServiceDef extends RangerBaseModelObject implements java.io.S this.accessTypes.clear(); if(accessTypes != null) { - for(RangerAccessTypeDef accessType : accessTypes) { - this.accessTypes.add(accessType); - } + this.accessTypes.addAll(accessTypes); } } @@ -2955,9 +2931,7 @@ public class RangerServiceDef extends RangerBaseModelObject implements java.io.S this.resources.clear(); if(resources != null) { - for(RangerResourceDef resource : resources) { - this.resources.add(resource); - } + this.resources.addAll(resources); } } http://git-wip-us.apache.org/repos/asf/ranger/blob/ed152bc6/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerPolicyValidator.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerPolicyValidator.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerPolicyValidator.java index b401c10..0b5fc0e 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerPolicyValidator.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerPolicyValidator.java @@ -257,12 +257,14 @@ public class RangerPolicyValidator extends RangerValidator { int policyType=policy.getPolicyType() == null ? RangerPolicy.POLICY_TYPE_ACCESS : policy.getPolicyType(); switch (policyType) { case RangerPolicy.POLICY_TYPE_DATAMASK: - if (CollectionUtils.isNotEmpty(policy.getDataMaskPolicyItems())) + if (CollectionUtils.isNotEmpty(policy.getDataMaskPolicyItems())) { policyItemsCount += policy.getDataMaskPolicyItems().size(); + } break; case RangerPolicy.POLICY_TYPE_ROWFILTER: - if (CollectionUtils.isNotEmpty(policy.getRowFilterPolicyItems())) + if (CollectionUtils.isNotEmpty(policy.getRowFilterPolicyItems())) { policyItemsCount += policy.getRowFilterPolicyItems().size(); + } break; default: if (CollectionUtils.isNotEmpty(policy.getPolicyItems())){ http://git-wip-us.apache.org/repos/asf/ranger/blob/ed152bc6/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceDefHelper.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceDefHelper.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceDefHelper.java index 89f36cd..3cdf40b 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceDefHelper.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceDefHelper.java @@ -273,11 +273,7 @@ public class RangerServiceDefHelper { * @return */ boolean isValid(DirectedGraph graph) { - if (graph.getSources().size() > 0 && graph.getSinks().size() > 0) { - return true; - } else { - return false; - } + return !graph.getSources().isEmpty() && !graph.getSinks().isEmpty(); } /** @@ -383,11 +379,7 @@ public class RangerServiceDefHelper { * @return */ boolean hasArc(String from, String to) { - if (_nodes.containsKey(from) && _nodes.containsKey(to) && _nodes.get(from).contains(to)) { - return true; - } else { - return false; - } + return _nodes.containsKey(from) && _nodes.containsKey(to) && _nodes.get(from).contains(to); } /** @@ -396,7 +388,7 @@ public class RangerServiceDefHelper { * @return */ boolean hasNeighbors(String from) { - return _nodes.containsKey(from) && _nodes.get(from).size() > 0; + return _nodes.containsKey(from) && !_nodes.get(from).isEmpty(); } /** * Return the set of nodes with in degree of 0, i.e. those that are not in any other nodes' list of neighbors http://git-wip-us.apache.org/repos/asf/ranger/blob/ed152bc6/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerValidator.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerValidator.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerValidator.java index d296879..509c188 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerValidator.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerValidator.java @@ -108,7 +108,7 @@ public abstract class RangerValidator { StringBuilder builder = new StringBuilder(); for (int i = 0; i < failures.size(); i++) { builder.append(String.format("(%d)", i)); - builder.append(failures.get(i).toString()); + builder.append(failures.get(i)); builder.append(" "); } message = builder.toString(); http://git-wip-us.apache.org/repos/asf/ranger/blob/ed152bc6/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngineImpl.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngineImpl.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngineImpl.java index 14b5402..93c29af 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngineImpl.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngineImpl.java @@ -604,7 +604,7 @@ public class RangerPolicyEngineImpl implements RangerPolicyEngine { if (evaluateResourcePolicies) { boolean findAuditByResource = !ret.getIsAuditedDetermined(); - boolean foundInCache = findAuditByResource ? policyRepository.setAuditEnabledFromCache(request, ret) : false; + boolean foundInCache = findAuditByResource && policyRepository.setAuditEnabledFromCache(request, ret); if(isAllowedByTags) { ret.setIsAccessDetermined(false); // discard allowed result by tag-policies, to evaluate resource policies for possible deny http://git-wip-us.apache.org/repos/asf/ranger/blob/ed152bc6/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerResourceAccessInfo.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerResourceAccessInfo.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerResourceAccessInfo.java index 6a00ce3..14e7d1c 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerResourceAccessInfo.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerResourceAccessInfo.java @@ -80,7 +80,7 @@ public class RangerResourceAccessInfo { sb.append("request={"); if(request != null) { - sb.append(request.toString()); + sb.append(request); } sb.append("} "); http://git-wip-us.apache.org/repos/asf/ranger/blob/ed152bc6/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerAbstractPolicyItemEvaluator.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerAbstractPolicyItemEvaluator.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerAbstractPolicyItemEvaluator.java index 67fb09e..103c057 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerAbstractPolicyItemEvaluator.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerAbstractPolicyItemEvaluator.java @@ -113,7 +113,7 @@ public abstract class RangerAbstractPolicyItemEvaluator implements RangerPolicyI } protected boolean getConditionsDisabledOption() { - return options != null ? options.disableCustomConditions : false; + return options != null && options.disableCustomConditions; } private int computeEvalOrder() { http://git-wip-us.apache.org/repos/asf/ranger/blob/ed152bc6/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyEvaluator.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyEvaluator.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyEvaluator.java index cfee884..1340007 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyEvaluator.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyEvaluator.java @@ -75,7 +75,7 @@ public class RangerDefaultPolicyEvaluator extends RangerAbstractPolicyEvaluator private String perfTag; - protected boolean needsDynamicEval() { return resourceMatcher != null ? resourceMatcher.getNeedsDynamicEval() : false; } + protected boolean needsDynamicEval() { return resourceMatcher != null && resourceMatcher.getNeedsDynamicEval(); } @Override public int getCustomConditionsCount() { @@ -336,11 +336,7 @@ public class RangerDefaultPolicyEvaluator extends RangerAbstractPolicyEvaluator LOG.debug("==> RangerDefaultPolicyEvaluator.isCompleteMatch(" + resource + ", " + evalContext + ")"); } - boolean ret = false; - - if(resourceMatcher != null) { - ret = resourceMatcher.isCompleteMatch(resource, evalContext); - } + boolean ret = resourceMatcher != null && resourceMatcher.isCompleteMatch(resource, evalContext); if(LOG.isDebugEnabled()) { LOG.debug("<== RangerDefaultPolicyEvaluator.isCompleteMatch(" + resource + "): " + ret); @@ -355,11 +351,7 @@ public class RangerDefaultPolicyEvaluator extends RangerAbstractPolicyEvaluator LOG.debug("==> RangerDefaultPolicyEvaluator.isCompleteMatch(" + resources + ", " + evalContext + ")"); } - boolean ret = false; - - if(resourceMatcher != null) { - ret = resourceMatcher.isCompleteMatch(resources, evalContext); - } + boolean ret = resourceMatcher != null && resourceMatcher.isCompleteMatch(resources, evalContext); if(LOG.isDebugEnabled()) { LOG.debug("<== RangerDefaultPolicyEvaluator.isCompleteMatch(" + resources + ", " + evalContext + "): " + ret); @@ -605,11 +597,7 @@ public class RangerDefaultPolicyEvaluator extends RangerAbstractPolicyEvaluator LOG.debug("==> RangerDefaultPolicyEvaluator.isMatch(" + resources + ", " + evalContext + ")"); } - boolean ret = false; - - if(resourceMatcher != null) { - ret = resourceMatcher.isMatch(resources, evalContext); - } + boolean ret = resourceMatcher != null && resourceMatcher.isMatch(resources, evalContext); if(LOG.isDebugEnabled()) { LOG.debug("<== RangerDefaultPolicyEvaluator.isMatch(" + resources + ", " + evalContext + "): " + ret); @@ -734,9 +722,7 @@ public class RangerDefaultPolicyEvaluator extends RangerAbstractPolicyEvaluator ret.put(accessTypeDef.getName(), impliedAccessGrants); } - for(String impliedAccessGrant : accessTypeDef.getImpliedGrants()) { - impliedAccessGrants.add(impliedAccessGrant); - } + impliedAccessGrants.addAll(accessTypeDef.getImpliedGrants()); } } } http://git-wip-us.apache.org/repos/asf/ranger/blob/ed152bc6/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerOptimizedPolicyEvaluator.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerOptimizedPolicyEvaluator.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerOptimizedPolicyEvaluator.java index 86a18ba..47b4921 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerOptimizedPolicyEvaluator.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerOptimizedPolicyEvaluator.java @@ -81,10 +81,10 @@ public class RangerOptimizedPolicyEvaluator extends RangerDefaultPolicyEvaluator hasAllPerms = checkIfHasAllPerms(); for (String user : users) { - if (!hasCurrentUser && user.equalsIgnoreCase(RangerPolicyEngine.USER_CURRENT)) { + if (!hasCurrentUser && RangerPolicyEngine.USER_CURRENT.equalsIgnoreCase(user)) { hasCurrentUser = true; } - if (!hasResourceOwner && user.equalsIgnoreCase(RangerPolicyEngine.RESOURCE_OWNER)) { + if (!hasResourceOwner && RangerPolicyEngine.RESOURCE_OWNER.equalsIgnoreCase(user)) { hasResourceOwner = true; } if (hasCurrentUser && hasResourceOwner) { @@ -93,7 +93,7 @@ public class RangerOptimizedPolicyEvaluator extends RangerDefaultPolicyEvaluator } for (String group : groups) { - if (group.equalsIgnoreCase(RangerPolicyEngine.GROUP_PUBLIC)) { + if (RangerPolicyEngine.GROUP_PUBLIC.equalsIgnoreCase(group)) { hasPublicGroup = true; break; } @@ -172,7 +172,7 @@ public class RangerOptimizedPolicyEvaluator extends RangerDefaultPolicyEvaluator boolean foundMatchAny = false; for (String resourceName : item.policyResource.getValues()) { - if (resourceName.isEmpty() || resourceName.equals(RANGER_POLICY_EVAL_MATCH_ANY_PATTERN_STRING)) { + if (resourceName.isEmpty() || RANGER_POLICY_EVAL_MATCH_ANY_PATTERN_STRING.equals(resourceName)) { foundMatchAny = true; break; } else if (resourceName.contains(RANGER_POLICY_EVAL_MATCH_ANY_PATTERN_STRING)) { http://git-wip-us.apache.org/repos/asf/ranger/blob/ed152bc6/agents-common/src/main/java/org/apache/ranger/plugin/policyresourcematcher/RangerDefaultPolicyResourceMatcher.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyresourcematcher/RangerDefaultPolicyResourceMatcher.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyresourcematcher/RangerDefaultPolicyResourceMatcher.java index d1c21ff..fa2b940 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/policyresourcematcher/RangerDefaultPolicyResourceMatcher.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyresourcematcher/RangerDefaultPolicyResourceMatcher.java @@ -90,8 +90,7 @@ public class RangerDefaultPolicyResourceMatcher implements RangerPolicyResourceM String errorText = ""; - if(policyResources != null && policyResources.size() > 0 && serviceDef != null) { - + if(policyResources != null && !policyResources.isEmpty() && serviceDef != null) { Set<String> policyResourceKeySet = policyResources.keySet(); RangerServiceDefHelper serviceDefHelper = new RangerServiceDefHelper(serviceDef, false); @@ -272,11 +271,7 @@ public class RangerDefaultPolicyResourceMatcher implements RangerPolicyResourceM Collection<String> resourceKeys = resource == null ? null : resource.getKeys(); Collection<String> policyKeys = matchers == null ? null : matchers.keySet(); - boolean keysMatch = false; - - if (resourceKeys != null && policyKeys != null) { - keysMatch = CollectionUtils.isEqualCollection(resourceKeys, policyKeys); - } + boolean keysMatch = resourceKeys != null && policyKeys != null && CollectionUtils.isEqualCollection(resourceKeys, policyKeys); if(keysMatch) { for(RangerResourceDef resourceDef : serviceDef.getResources()) { @@ -320,11 +315,7 @@ public class RangerDefaultPolicyResourceMatcher implements RangerPolicyResourceM Collection<String> resourceKeys = resources == null ? null : resources.keySet(); Collection<String> policyKeys = matchers == null ? null : matchers.keySet(); - boolean keysMatch = false; - - if (resourceKeys != null && policyKeys != null) { - keysMatch = CollectionUtils.isEqualCollection(resourceKeys, policyKeys); - } + boolean keysMatch = resourceKeys != null && policyKeys != null && CollectionUtils.isEqualCollection(resourceKeys, policyKeys); if(keysMatch) { for(RangerResourceDef resourceDef : serviceDef.getResources()) { http://git-wip-us.apache.org/repos/asf/ranger/blob/ed152bc6/agents-common/src/main/java/org/apache/ranger/plugin/resourcematcher/RangerAbstractResourceMatcher.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/resourcematcher/RangerAbstractResourceMatcher.java b/agents-common/src/main/java/org/apache/ranger/plugin/resourcematcher/RangerAbstractResourceMatcher.java index acfbf02..8c47df2 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/resourcematcher/RangerAbstractResourceMatcher.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/resourcematcher/RangerAbstractResourceMatcher.java @@ -86,8 +86,8 @@ public abstract class RangerAbstractResourceMatcher implements RangerResourceMat optIgnoreCase = getOptionIgnoreCase(options); optWildCard = getOptionWildCard(options); - policyValues = new ArrayList<String>(); - policyIsExcludes = policyResource == null ? false : policyResource.getIsExcludes(); + policyValues = new ArrayList<>(); + policyIsExcludes = policyResource != null && policyResource.getIsExcludes(); if (policyResource != null && policyResource.getValues() != null) { for (String policyValue : policyResource.getValues()) { http://git-wip-us.apache.org/repos/asf/ranger/blob/ed152bc6/agents-common/src/main/java/org/apache/ranger/plugin/resourcematcher/RangerPathResourceMatcher.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/resourcematcher/RangerPathResourceMatcher.java b/agents-common/src/main/java/org/apache/ranger/plugin/resourcematcher/RangerPathResourceMatcher.java index 2df0201..300c1f8 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/resourcematcher/RangerPathResourceMatcher.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/resourcematcher/RangerPathResourceMatcher.java @@ -51,7 +51,7 @@ public class RangerPathResourceMatcher extends RangerDefaultResourceMatcher { Map<String, String> options = resourceDef == null ? null : resourceDef.getMatcherOptions(); - policyIsRecursive = policyResource == null ? false : policyResource.getIsRecursive(); + policyIsRecursive = policyResource != null && policyResource.getIsRecursive(); pathSeparatorChar = ServiceDefUtil.getCharOption(options, OPTION_PATH_SEPARATOR, DEFAULT_PATH_SEPARATOR_CHAR); super.init(); @@ -107,7 +107,7 @@ public class RangerPathResourceMatcher extends RangerDefaultResourceMatcher { } // To ensure that when policyValue is single '*', ResourceMatcher created here returns true for isMatchAny() - if (optWildCard && policyValue.equals(WILDCARD_ASTERISK)) { + if (optWildCard && WILDCARD_ASTERISK.equals(policyValue)) { return new CaseInsensitiveStringMatcher(""); } http://git-wip-us.apache.org/repos/asf/ranger/blob/ed152bc6/agents-common/src/main/java/org/apache/ranger/plugin/store/AbstractPredicateUtil.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/store/AbstractPredicateUtil.java b/agents-common/src/main/java/org/apache/ranger/plugin/store/AbstractPredicateUtil.java index df216a7..36a9a27 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/store/AbstractPredicateUtil.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/store/AbstractPredicateUtil.java @@ -195,8 +195,8 @@ public class AbstractPredicateUtil { protected final static Comparator<RangerBaseModelObject> policyNameComparator = new Comparator<RangerBaseModelObject>() { @Override public int compare(RangerBaseModelObject o1, RangerBaseModelObject o2) { - String val1 = (o1 != null && o1 instanceof RangerPolicy) ? ((RangerPolicy)o1).getName() : null; - String val2 = (o2 != null && o2 instanceof RangerPolicy) ? ((RangerPolicy)o2).getName() : null; + String val1 = (o1 instanceof RangerPolicy) ? ((RangerPolicy)o1).getName() : null; + String val2 = (o2 instanceof RangerPolicy) ? ((RangerPolicy)o2).getName() : null; return ObjectUtils.compare(val1, val2); } http://git-wip-us.apache.org/repos/asf/ranger/blob/ed152bc6/agents-common/src/main/java/org/apache/ranger/plugin/store/AbstractServiceStore.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/store/AbstractServiceStore.java b/agents-common/src/main/java/org/apache/ranger/plugin/store/AbstractServiceStore.java index 023b4f8..1702dec 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/store/AbstractServiceStore.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/store/AbstractServiceStore.java @@ -276,7 +276,7 @@ public abstract class AbstractServiceStore implements ServiceStore { } private void updateTagServiceDefForDeletingAccessTypes(String serviceDefName) throws Exception { - if (serviceDefName.equals(EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_TAG_NAME)) { + if (EmbeddedServiceDefsUtil.EMBEDDED_SERVICEDEF_TAG_NAME.equals(serviceDefName)) { return; } http://git-wip-us.apache.org/repos/asf/ranger/blob/ed152bc6/agents-common/src/main/java/org/apache/ranger/plugin/store/EmbeddedServiceDefsUtil.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/store/EmbeddedServiceDefsUtil.java b/agents-common/src/main/java/org/apache/ranger/plugin/store/EmbeddedServiceDefsUtil.java index 07c7a1e..bbb4197 100755 --- a/agents-common/src/main/java/org/apache/ranger/plugin/store/EmbeddedServiceDefsUtil.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/store/EmbeddedServiceDefsUtil.java @@ -274,9 +274,7 @@ public class EmbeddedServiceDefsUtil { for(String element:supportedComponents){ if(!StringUtils.isBlank(element)){ element=element.toLowerCase(); - if(!supportedServiceDef.contains(element)){ - supportedServiceDef.add(element); - } + supportedServiceDef.add(element); } } } http://git-wip-us.apache.org/repos/asf/ranger/blob/ed152bc6/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerAccessRequestUtil.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerAccessRequestUtil.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerAccessRequestUtil.java index f3f7ffc..c20ccde 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerAccessRequestUtil.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerAccessRequestUtil.java @@ -52,7 +52,7 @@ public class RangerAccessRequestUtil { Set<RangerTagForEval> ret = null; Object val = context.get(RangerAccessRequestUtil.KEY_CONTEXT_TAGS); - if (val != null && val instanceof Set<?>) { + if (val instanceof Set<?>) { try { @SuppressWarnings("unchecked") Set<RangerTagForEval> tags = (Set<RangerTagForEval>) val; @@ -74,7 +74,7 @@ public class RangerAccessRequestUtil { RangerTagForEval ret = null; Object val = context.get(KEY_CONTEXT_TAGS); - if(val != null && val instanceof RangerTagForEval) { + if(val instanceof RangerTagForEval) { ret = (RangerTagForEval)val; } @@ -89,7 +89,7 @@ public class RangerAccessRequestUtil { RangerRequestedResources ret = null; Object val = context.get(KEY_CONTEXT_REQUESTED_RESOURCES); - if(val != null && val instanceof RangerRequestedResources) { + if(val instanceof RangerRequestedResources) { ret = (RangerRequestedResources)val; } @@ -104,7 +104,7 @@ public class RangerAccessRequestUtil { RangerAccessResource ret = null; Object val = context.get(KEY_CONTEXT_RESOURCE); - if(val != null && val instanceof RangerAccessResource) { + if(val instanceof RangerAccessResource) { ret = (RangerAccessResource)val; } http://git-wip-us.apache.org/repos/asf/ranger/blob/ed152bc6/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRequestedResources.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRequestedResources.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRequestedResources.java index c73d68a..a5107b3 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRequestedResources.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRequestedResources.java @@ -52,15 +52,7 @@ public class RangerRequestedResources { requestedResources = new ArrayList<>(); } - boolean exists = false; - - for (RangerAccessResource resource : requestedResources) { - - if (requestedResource.equals(resource)) { - exists = true; - break; - } - } + boolean exists = requestedResources.contains(requestedResource); if (!exists) { requestedResources.add(requestedResource); http://git-wip-us.apache.org/repos/asf/ranger/blob/ed152bc6/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerResourceTrie.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerResourceTrie.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerResourceTrie.java index bb4d145..7897f46 100644 --- a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerResourceTrie.java +++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerResourceTrie.java @@ -288,7 +288,7 @@ class TrieNode<T extends RangerPolicyResourceEvaluator> { } } - if(children != null && children.size() > 0) { + if(children != null && !children.isEmpty()) { if(children.size() == 1) { trieData.singleChildNodeCount++; } http://git-wip-us.apache.org/repos/asf/ranger/blob/ed152bc6/agents-common/src/main/java/org/apache/ranger/services/tag/RangerServiceTag.java ---------------------------------------------------------------------- diff --git a/agents-common/src/main/java/org/apache/ranger/services/tag/RangerServiceTag.java b/agents-common/src/main/java/org/apache/ranger/services/tag/RangerServiceTag.java index 859cdd9..98413d9 100644 --- a/agents-common/src/main/java/org/apache/ranger/services/tag/RangerServiceTag.java +++ b/agents-common/src/main/java/org/apache/ranger/services/tag/RangerServiceTag.java @@ -87,9 +87,7 @@ public class RangerServiceTag extends RangerBaseService { List<String> valuesToExclude = MapUtils.isNotEmpty(context.getResources()) ? context.getResources().get(TAG_RESOURCE_NAME) : null; if(CollectionUtils.isNotEmpty(valuesToExclude)) { - for (String valueToExclude : valuesToExclude) { - tags.remove(valueToExclude); - } + tags.removeAll(valuesToExclude); } String valueToMatch = context.getUserInput(); http://git-wip-us.apache.org/repos/asf/ranger/blob/ed152bc6/agents-common/src/test/java/org/apache/ranger/plugin/conditionevaluator/RangerIpMatcherTest.java ---------------------------------------------------------------------- diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/conditionevaluator/RangerIpMatcherTest.java b/agents-common/src/test/java/org/apache/ranger/plugin/conditionevaluator/RangerIpMatcherTest.java index 10780cf..9b221e2 100644 --- a/agents-common/src/test/java/org/apache/ranger/plugin/conditionevaluator/RangerIpMatcherTest.java +++ b/agents-common/src/test/java/org/apache/ranger/plugin/conditionevaluator/RangerIpMatcherTest.java @@ -227,15 +227,14 @@ public class RangerIpMatcherTest { if (ipArray == null) { matcher.setConditionDef(null); matcher.setPolicyItemCondition(null); - matcher.init(); } else { RangerPolicyItemCondition condition = mock(RangerPolicyItemCondition.class); List<String> addresses = Arrays.asList(ipArray); when(condition.getValues()).thenReturn(addresses); matcher.setConditionDef(null); matcher.setPolicyItemCondition(condition); - matcher.init(); } + matcher.init(); return matcher; } http://git-wip-us.apache.org/repos/asf/ranger/blob/ed152bc6/agents-common/src/test/java/org/apache/ranger/plugin/conditionevaluator/RangerSimpleMatcher.java ---------------------------------------------------------------------- diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/conditionevaluator/RangerSimpleMatcher.java b/agents-common/src/test/java/org/apache/ranger/plugin/conditionevaluator/RangerSimpleMatcher.java index ed96773..fc19ed7 100644 --- a/agents-common/src/test/java/org/apache/ranger/plugin/conditionevaluator/RangerSimpleMatcher.java +++ b/agents-common/src/test/java/org/apache/ranger/plugin/conditionevaluator/RangerSimpleMatcher.java @@ -65,9 +65,7 @@ public class RangerSimpleMatcher extends RangerAbstractConditionEvaluator { _allowAny = true; } else { _contextName = conditionDef.getEvaluatorOptions().get(CONTEXT_NAME); - for (String value : condition.getValues()) { - _values.add(value); - } + _values.addAll(condition.getValues()); } if(LOG.isDebugEnabled()) { http://git-wip-us.apache.org/repos/asf/ranger/blob/ed152bc6/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerValidator.java ---------------------------------------------------------------------- diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerValidator.java b/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerValidator.java index 1728c22..a749b27 100644 --- a/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerValidator.java +++ b/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerValidator.java @@ -60,12 +60,7 @@ public class TestRangerValidator { boolean isValid(String behavior) { boolean valid; - if (behavior.equals("valid")) { - valid = true; - } else { - valid = false; - } - return valid; + return "valid".equals(behavior); } }
