You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@ranger.apache.org by co...@apache.org on 2017/02/10 14:24:55 UTC
[2/3] ranger git commit: RANGER-1371 : Remove unneded field
initializers, and unnecessary generic type informations
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/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 3400d81..d296879 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
@@ -69,7 +69,7 @@ public abstract class RangerValidator {
LOG.debug("==> RangerValidator.validate(" + id + ")");
}
- List<ValidationFailureDetails> failures = new ArrayList<ValidationFailureDetails>();
+ List<ValidationFailureDetails> failures = new ArrayList<>();
if (isValid(id, action, failures)) {
if(LOG.isDebugEnabled()) {
LOG.debug("<== RangerValidator.validate(" + id + "): valid");
@@ -122,7 +122,7 @@ public abstract class RangerValidator {
Set<String> getServiceConfigParameters(RangerService service) {
if (service == null || service.getConfigs() == null) {
- return new HashSet<String>();
+ return new HashSet<>();
} else {
return service.getConfigs().keySet();
}
@@ -295,7 +295,7 @@ public abstract class RangerValidator {
LOG.debug("==> RangerValidator.getAccessTypes(" + serviceDef + ")");
}
- Set<String> accessTypes = new HashSet<String>();
+ Set<String> accessTypes = new HashSet<>();
if (serviceDef == null) {
LOG.warn("serviceDef passed in was null!");
} else if (CollectionUtils.isEmpty(serviceDef.getAccessTypes())) {
@@ -356,7 +356,7 @@ public abstract class RangerValidator {
LOG.debug("==> RangerValidator.getMandatoryResourceNames(" + serviceDef + ")");
}
- Set<String> resourceNames = new HashSet<String>();
+ Set<String> resourceNames = new HashSet<>();
if (serviceDef == null) {
LOG.warn("serviceDef passed in was null!");
} else if (CollectionUtils.isEmpty(serviceDef.getResources())) {
@@ -390,7 +390,7 @@ public abstract class RangerValidator {
LOG.debug("==> RangerValidator.getAllResourceNames(" + serviceDef + ")");
}
- Set<String> resourceNames = new HashSet<String>();
+ Set<String> resourceNames = new HashSet<>();
if (serviceDef == null) {
LOG.warn("serviceDef passed in was null!");
} else if (CollectionUtils.isEmpty(serviceDef.getResources())) {
@@ -423,9 +423,9 @@ public abstract class RangerValidator {
*/
Set<String> getPolicyResources(RangerPolicy policy) {
if (policy == null || policy.getResources() == null || policy.getResources().isEmpty()) {
- return new HashSet<String>();
+ return new HashSet<>();
} else {
- Set<String> result = new HashSet<String>();
+ Set<String> result = new HashSet<>();
for (String name : policy.getResources().keySet()) {
result.add(name.toLowerCase());
}
@@ -435,9 +435,9 @@ public abstract class RangerValidator {
Map<String, String> getValidationRegExes(RangerServiceDef serviceDef) {
if (serviceDef == null || CollectionUtils.isEmpty(serviceDef.getResources())) {
- return new HashMap<String, String>();
+ return new HashMap<>();
} else {
- Map<String, String> result = new HashMap<String, String>();
+ Map<String, String> result = new HashMap<>();
for (RangerResourceDef resourceDef : serviceDef.getResources()) {
if (resourceDef == null) {
LOG.warn("A resource def in resource def collection is null");
@@ -473,7 +473,7 @@ public abstract class RangerValidator {
if (def == null) {
return null;
} else if (CollectionUtils.isEmpty(def.getImpliedGrants())) {
- return new ArrayList<String>();
+ return new ArrayList<>();
} else {
List<String> result = new ArrayList<String>(def.getImpliedGrants().size());
for (String name : def.getImpliedGrants()) {
@@ -633,7 +633,7 @@ public abstract class RangerValidator {
}
Map<String, RangerEnumDef> getEnumDefMap(List<RangerEnumDef> enumDefs) {
- Map<String, RangerEnumDef> result = new HashMap<String, RangerServiceDef.RangerEnumDef>();
+ Map<String, RangerEnumDef> result = new HashMap<>();
if (enumDefs != null) {
for (RangerEnumDef enumDef : enumDefs) {
result.put(enumDef.getName(), enumDef);
@@ -643,7 +643,7 @@ public abstract class RangerValidator {
}
Set<String> getEnumValues(RangerEnumDef enumDef) {
- Set<String> result = new HashSet<String>();
+ Set<String> result = new HashSet<>();
if (enumDef != null) {
for (RangerEnumElementDef element : enumDef.getElements()) {
result.add(element.getName());
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessRequestImpl.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessRequestImpl.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessRequestImpl.java
index 17d1a71..15e872a 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessRequestImpl.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessRequestImpl.java
@@ -34,22 +34,22 @@ import org.apache.log4j.Logger;
public class RangerAccessRequestImpl implements RangerAccessRequest {
private static final Logger LOG = Logger.getLogger(RangerAccessRequestImpl.class);
- private RangerAccessResource resource = null;
- private String accessType = null;
- private String user = null;
- private Set<String> userGroups = null;
- private Date accessTime = null;
- private String clientIPAddress = null;
- private List<String> forwardedAddresses = null;
- private String remoteIPAddress = null;
- private String clientType = null;
- private String action = null;
- private String requestData = null;
- private String sessionId = null;
- private Map<String, Object> context = null;
-
- private boolean isAccessTypeAny = false;
- private boolean isAccessTypeDelegatedAdmin = false;
+ private RangerAccessResource resource;
+ private String accessType;
+ private String user;
+ private Set<String> userGroups;
+ private Date accessTime;
+ private String clientIPAddress;
+ private List<String> forwardedAddresses;
+ private String remoteIPAddress;
+ private String clientType;
+ private String action;
+ private String requestData;
+ private String sessionId;
+ private Map<String, Object> context;
+
+ private boolean isAccessTypeAny;
+ private boolean isAccessTypeDelegatedAdmin;
private ResourceMatchingScope resourceMatchingScope = ResourceMatchingScope.SELF;
public RangerAccessRequestImpl() {
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessResourceImpl.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessResourceImpl.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessResourceImpl.java
index a73f944..9d8a651 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessResourceImpl.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessResourceImpl.java
@@ -29,15 +29,13 @@ import org.apache.commons.lang.ObjectUtils;
import org.apache.ranger.plugin.model.RangerServiceDef;
import org.apache.ranger.plugin.model.RangerServiceDef.RangerResourceDef;
-
public class RangerAccessResourceImpl implements RangerMutableResource {
- private String ownerUser = null;
- private Map<String, String> elements = null;
- private String stringifiedValue = null;
- private String stringifiedCacheKeyValue = null;
- private String leafName = null;
- private RangerServiceDef serviceDef = null;
-
+ private String ownerUser;
+ private Map<String, String> elements;
+ private String stringifiedValue;
+ private String stringifiedCacheKeyValue;
+ private String leafName;
+ private RangerServiceDef serviceDef;
public RangerAccessResourceImpl() {
this(null, null);
@@ -101,7 +99,7 @@ public class RangerAccessResourceImpl implements RangerMutableResource {
}
} else {
if(elements == null) {
- elements = new HashMap<String, String>();
+ elements = new HashMap<>();
}
elements.put(name, value);
}
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessResourceReadOnly.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessResourceReadOnly.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessResourceReadOnly.java
index 94c7c9d..18bb1f4 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessResourceReadOnly.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessResourceReadOnly.java
@@ -38,14 +38,14 @@ public class RangerAccessResourceReadOnly implements RangerAccessResource {
Set<String> sourceKeys = source.getKeys();
if (CollectionUtils.isEmpty(sourceKeys)) {
- sourceKeys = new HashSet<String>();
+ sourceKeys = new HashSet<>();
}
this.keys = Collections.unmodifiableSet(sourceKeys);
Map<String, String> sourceMap = source.getAsMap();
if (MapUtils.isEmpty(sourceMap)) {
- sourceMap = new HashMap<String, String>();
+ sourceMap = new HashMap<>();
}
this.map = Collections.unmodifiableMap(sourceMap);
}
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessResult.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessResult.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessResult.java
index 501a7d1..904fc86 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessResult.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerAccessResult.java
@@ -16,25 +16,23 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ranger.plugin.policyengine;
import org.apache.ranger.plugin.model.RangerServiceDef;
-
public class RangerAccessResult {
private final String serviceName;
private final RangerServiceDef serviceDef;
private final RangerAccessRequest request;
- private boolean isAccessDetermined = false;
- private boolean isAllowed = false;
- private boolean isAuditedDetermined = false;
- private boolean isAudited = false;
+ private boolean isAccessDetermined;
+ private boolean isAllowed;
+ private boolean isAuditedDetermined;
+ private boolean isAudited;
private long auditPolicyId = -1;
private long policyId = -1;
- private long evaluatedPoliciesCount = 0;
- private String reason = null;
+ private long evaluatedPoliciesCount;
+ private String reason;
public RangerAccessResult(final String serviceName, final RangerServiceDef serviceDef, final RangerAccessRequest request) {
this.serviceName = serviceName;
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerDataMaskResult.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerDataMaskResult.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerDataMaskResult.java
index e0854df..2260c45 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerDataMaskResult.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerDataMaskResult.java
@@ -24,12 +24,10 @@ import org.apache.ranger.plugin.model.RangerServiceDef;
import org.apache.ranger.plugin.model.RangerServiceDef.RangerDataMaskTypeDef;
import org.apache.ranger.plugin.util.ServiceDefUtil;
-
public class RangerDataMaskResult extends RangerAccessResult {
- private String maskType = null;
- private String maskCondition = null;
- private String maskedValue = null;
-
+ private String maskType;
+ private String maskCondition;
+ private String maskedValue;
public RangerDataMaskResult(final String serviceName, final RangerServiceDef serviceDef, final RangerAccessRequest request) {
this(serviceName, serviceDef, request, null);
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngineCache.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngineCache.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngineCache.java
index 51f2142..5376b52 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngineCache.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngineCache.java
@@ -35,7 +35,7 @@ public class RangerPolicyEngineCache {
private final Map<String, RangerPolicyEngine> policyEngineCache = Collections.synchronizedMap(new HashMap<String, RangerPolicyEngine>());
- private RangerPolicyEngineOptions options = null;
+ private RangerPolicyEngineOptions options;
public static RangerPolicyEngineCache getInstance() {
return sInstance;
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/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 0ce7a17..14b5402 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
@@ -62,8 +62,8 @@ public class RangerPolicyEngineImpl implements RangerPolicyEngine {
private final Map<Long, RangerPolicyEvaluator> policyEvaluatorsMap;
- private boolean useForwardedIPAddress = false;
- private String[] trustedProxyAddresses = null;
+ private boolean useForwardedIPAddress;
+ private String[] trustedProxyAddresses;
public RangerPolicyEngineImpl(String appId, ServicePolicies servicePolicies, RangerPolicyEngineOptions options) {
if (LOG.isDebugEnabled()) {
@@ -137,7 +137,7 @@ public class RangerPolicyEngineImpl implements RangerPolicyEngine {
} else if (CollectionUtils.isEmpty(resourceContextEnrichers)) {
tmpList = tagContextEnrichers;
} else {
- tmpList = new ArrayList<RangerContextEnricher>(tagContextEnrichers);
+ tmpList = new ArrayList<>(tagContextEnrichers);
tmpList.addAll(resourceContextEnrichers);
}
@@ -295,11 +295,10 @@ public class RangerPolicyEngineImpl implements RangerPolicyEngine {
LOG.debug("==> RangerPolicyEngineImpl.isAccessAllowed(" + requests + ")");
}
- Collection<RangerAccessResult> ret = new ArrayList<RangerAccessResult>();
+ Collection<RangerAccessResult> ret = new ArrayList<>();
if (requests != null) {
for (RangerAccessRequest request : requests) {
-
RangerAccessResult result = isAccessAllowedNoAudit(request);
ret.add(result);
@@ -473,7 +472,7 @@ public class RangerPolicyEngineImpl implements RangerPolicyEngine {
for (RangerPolicyEvaluator evaluator : policyRepository.getPolicyEvaluators()) {
if (evaluator.isCompleteMatch(resource, evalContext)) {
if(ret == null) {
- ret = new ArrayList<RangerPolicy>();
+ ret = new ArrayList<>();
}
ret.add(evaluator.getPolicy());
@@ -498,7 +497,7 @@ public class RangerPolicyEngineImpl implements RangerPolicyEngine {
for (RangerPolicyEvaluator evaluator : policyRepository.getPolicyEvaluators()) {
if (evaluator.isCompleteMatch(resources, evalContext)) {
if(ret == null) {
- ret = new ArrayList<RangerPolicy>();
+ ret = new ArrayList<>();
}
ret.add(evaluator.getPolicy());
@@ -518,7 +517,7 @@ public class RangerPolicyEngineImpl implements RangerPolicyEngine {
LOG.debug("==> RangerPolicyEngineImpl.getAllowedPolicies(" + user + ", " + userGroups + ", " + accessType + ")");
}
- List<RangerPolicy> ret = new ArrayList<RangerPolicy>();
+ List<RangerPolicy> ret = new ArrayList<>();
// TODO: run through evaluator in tagPolicyRepository as well
for (RangerPolicyEvaluator evaluator : policyRepository.getPolicyEvaluators()) {
@@ -877,7 +876,7 @@ public class RangerPolicyEngineImpl implements RangerPolicyEngine {
}
private Map<Long, RangerPolicyEvaluator> createPolicyEvaluatorsMap() {
- Map<Long, RangerPolicyEvaluator> tmpPolicyEvaluatorMap = new HashMap<Long, RangerPolicyEvaluator>();
+ Map<Long, RangerPolicyEvaluator> tmpPolicyEvaluatorMap = new HashMap<>();
if (tagPolicyRepository != null) {
for (RangerPolicyEvaluator evaluator : tagPolicyRepository.getPolicyEvaluators()) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngineOptions.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngineOptions.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngineOptions.java
index 2b2cf9b..a9027bc 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngineOptions.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyEngineOptions.java
@@ -16,18 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ranger.plugin.policyengine;
import org.apache.ranger.plugin.policyevaluator.RangerPolicyEvaluator;
-
public class RangerPolicyEngineOptions {
public String evaluatorType = RangerPolicyEvaluator.EVALUATOR_TYPE_AUTO;
public boolean cacheAuditResults = true;
- public boolean disableContextEnrichers = false;
- public boolean disableCustomConditions = false;
+ public boolean disableContextEnrichers;
+ public boolean disableCustomConditions;
public boolean disableTagPolicyEvaluation = true;
- public boolean evaluateDelegateAdminOnly = false;
- public boolean disableTrieLookupPrefilter = false;
+ public boolean evaluateDelegateAdminOnly;
+ public boolean disableTrieLookupPrefilter;
}
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyRepository.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyRepository.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyRepository.java
index 45bb278..0793a6a 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyRepository.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerPolicyRepository.java
@@ -335,7 +335,7 @@ class RangerPolicyRepository {
String newImpliedGrant = StringUtils.removeStart(impliedGrant, prefix);
if (newImpliedGrants == null) {
- newImpliedGrants = new ArrayList<String>();
+ newImpliedGrants = new ArrayList<>();
}
newImpliedGrants.add(newImpliedGrant);
@@ -346,7 +346,7 @@ class RangerPolicyRepository {
}
} else if (StringUtils.contains(accessType, AbstractServiceStore.COMPONENT_ACCESSTYPE_SEPARATOR)) {
if(unneededAccessTypeDefs == null) {
- unneededAccessTypeDefs = new ArrayList<RangerServiceDef.RangerAccessTypeDef>();
+ unneededAccessTypeDefs = new ArrayList<>();
}
unneededAccessTypeDefs.add(accessTypeDef);
@@ -383,7 +383,7 @@ class RangerPolicyRepository {
CollectionUtils.isEmpty(policy.getRowFilterPolicyItems())) {
if(policiesToPrune == null) {
- policiesToPrune = new ArrayList<RangerPolicy>();
+ policiesToPrune = new ArrayList<>();
}
policiesToPrune.add(policy);
@@ -418,7 +418,7 @@ class RangerPolicyRepository {
access.setType(newAccessType);
} else if (accessType.contains(AbstractServiceStore.COMPONENT_ACCESSTYPE_SEPARATOR)) {
if(accessesToPrune == null) {
- accessesToPrune = new ArrayList<RangerPolicy.RangerPolicyItemAccess>();
+ accessesToPrune = new ArrayList<>();
}
accessesToPrune.add(access);
@@ -431,7 +431,7 @@ class RangerPolicyRepository {
if (policyItemAccesses.isEmpty() && !policyItem.getDelegateAdmin()) {
if(itemsToPrune == null) {
- itemsToPrune = new ArrayList< RangerPolicy.RangerPolicyItem>();
+ itemsToPrune = new ArrayList<>();
}
itemsToPrune.add(policyItem);
@@ -482,10 +482,9 @@ class RangerPolicyRepository {
}
private void init(RangerPolicyEngineOptions options) {
-
- List<RangerPolicyEvaluator> policyEvaluators = new ArrayList<RangerPolicyEvaluator>();
- List<RangerPolicyEvaluator> dataMaskPolicyEvaluators = new ArrayList<RangerPolicyEvaluator>();
- List<RangerPolicyEvaluator> rowFilterPolicyEvaluators = new ArrayList<RangerPolicyEvaluator>();
+ List<RangerPolicyEvaluator> policyEvaluators = new ArrayList<>();
+ List<RangerPolicyEvaluator> dataMaskPolicyEvaluators = new ArrayList<>();
+ List<RangerPolicyEvaluator> rowFilterPolicyEvaluators = new ArrayList<>();
for (RangerPolicy policy : policies) {
if (skipBuildingPolicyEvaluator(policy, options)) {
@@ -765,8 +764,7 @@ class RangerPolicyRepository {
List<RangerPolicyEvaluator> ret = evaluators;
if (CollectionUtils.isNotEmpty(evaluators)) {
-
- ret = new ArrayList<RangerPolicyEvaluator>(evaluators);
+ ret = new ArrayList<>(evaluators);
Collections.sort(ret);
ret = Collections.unmodifiableList(ret);
@@ -779,7 +777,7 @@ class RangerPolicyRepository {
final Map<String, RangerResourceTrie> ret;
if (CollectionUtils.isNotEmpty(evaluators) && serviceDef != null && CollectionUtils.isNotEmpty(serviceDef.getResources())) {
- ret = new HashMap<String, RangerResourceTrie>();
+ ret = new HashMap<>();
for (RangerServiceDef.RangerResourceDef resourceDef : serviceDef.getResources()) {
ret.put(resourceDef.getName(), new RangerResourceTrie(resourceDef, evaluators));
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/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 44ec854..6a00ce3 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
@@ -32,10 +32,10 @@ public class RangerResourceAccessInfo {
public RangerResourceAccessInfo(RangerAccessRequest request) {
this.request = request;
- this.allowedUsers = new HashSet<String>();
- this.allowedGroups = new HashSet<String>();
- this.deniedUsers = new HashSet<String>();
- this.deniedGroups = new HashSet<String>();
+ this.allowedUsers = new HashSet<>();
+ this.allowedGroups = new HashSet<>();
+ this.deniedUsers = new HashSet<>();
+ this.deniedGroups = new HashSet<>();
}
public RangerResourceAccessInfo(RangerResourceAccessInfo other) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerRowFilterResult.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerRowFilterResult.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerRowFilterResult.java
index ad82471..cd59a6d 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerRowFilterResult.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyengine/RangerRowFilterResult.java
@@ -22,10 +22,8 @@ import org.apache.commons.lang.StringUtils;
import org.apache.ranger.plugin.model.RangerPolicy;
import org.apache.ranger.plugin.model.RangerServiceDef;
-
public class RangerRowFilterResult extends RangerAccessResult {
- private String filterExpr = null;
-
+ private String filterExpr;
public RangerRowFilterResult(final String serviceName, final RangerServiceDef serviceDef, final RangerAccessRequest request) {
this(serviceName, serviceDef, request, null);
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerAbstractPolicyEvaluator.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerAbstractPolicyEvaluator.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerAbstractPolicyEvaluator.java
index 81dbe0e..80d0fd4 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerAbstractPolicyEvaluator.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerAbstractPolicyEvaluator.java
@@ -36,11 +36,11 @@ import java.util.Map;
public abstract class RangerAbstractPolicyEvaluator implements RangerPolicyEvaluator {
private static final Log LOG = LogFactory.getLog(RangerAbstractPolicyEvaluator.class);
- private RangerPolicy policy = null;
- private RangerServiceDef serviceDef = null;
- private Integer leafResourceLevel = null;
- private int evalOrder = 0;
- protected long usageCount = 0;
+ private RangerPolicy policy;
+ private RangerServiceDef serviceDef;
+ private Integer leafResourceLevel;
+ private int evalOrder;
+ protected long usageCount;
protected boolean usageCountMutable = true;
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/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 ffb9523..cfee884 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
@@ -64,14 +64,14 @@ public class RangerDefaultPolicyEvaluator extends RangerAbstractPolicyEvaluator
private static final Log PERF_POLICY_INIT_LOG = RangerPerfTracer.getPerfLogger("policy.init");
private static final Log PERF_POLICY_REQUEST_LOG = RangerPerfTracer.getPerfLogger("policy.request");
- private RangerPolicyResourceMatcher resourceMatcher = null;
- private List<RangerPolicyItemEvaluator> allowEvaluators = null;
- private List<RangerPolicyItemEvaluator> denyEvaluators = null;
- private List<RangerPolicyItemEvaluator> allowExceptionEvaluators = null;
- private List<RangerPolicyItemEvaluator> denyExceptionEvaluators = null;
- private int customConditionsCount = 0;
- private List<RangerDataMaskPolicyItemEvaluator> dataMaskEvaluators = null;
- private List<RangerRowFilterPolicyItemEvaluator> rowFilterEvaluators = null;
+ private RangerPolicyResourceMatcher resourceMatcher;
+ private List<RangerPolicyItemEvaluator> allowEvaluators;
+ private List<RangerPolicyItemEvaluator> denyEvaluators;
+ private List<RangerPolicyItemEvaluator> allowExceptionEvaluators;
+ private List<RangerPolicyItemEvaluator> denyExceptionEvaluators;
+ private int customConditionsCount;
+ private List<RangerDataMaskPolicyItemEvaluator> dataMaskEvaluators;
+ private List<RangerRowFilterPolicyItemEvaluator> rowFilterEvaluators;
private String perfTag;
@@ -374,7 +374,7 @@ public class RangerDefaultPolicyEvaluator extends RangerAbstractPolicyEvaluator
LOG.debug("==> RangerDefaultPolicyEvaluator.isAccessAllowed(" + resource + ", " + user + ", " + userGroups + ", " + accessType + ")");
}
- Map<String, Object> evalContext = new HashMap<String, Object>();
+ Map<String, Object> evalContext = new HashMap<>();
RangerAccessRequestUtil.setCurrentUserInContext(evalContext, user);
boolean ret = isAccessAllowed(user, userGroups, accessType) && isMatch(resource, evalContext);
@@ -392,7 +392,7 @@ public class RangerDefaultPolicyEvaluator extends RangerAbstractPolicyEvaluator
LOG.debug("==> RangerDefaultPolicyEvaluator.isAccessAllowed(" + resources + ", " + user + ", " + userGroups + ", " + accessType + ")");
}
- Map<String, Object> evalContext = new HashMap<String, Object>();
+ Map<String, Object> evalContext = new HashMap<>();
RangerAccessRequestUtil.setCurrentUserInContext(evalContext, user);
boolean ret = isAccessAllowed(user, userGroups, accessType) && isMatch(resources, evalContext);
@@ -423,14 +423,14 @@ public class RangerDefaultPolicyEvaluator extends RangerAbstractPolicyEvaluator
if (isMatched) {
if (CollectionUtils.isNotEmpty(allowEvaluators)) {
- Set<String> users = new HashSet<String>();
- Set<String> groups = new HashSet<String>();
+ Set<String> users = new HashSet<>();
+ Set<String> groups = new HashSet<>();
getResourceAccessInfo(request, allowEvaluators, users, groups);
if (CollectionUtils.isNotEmpty(allowExceptionEvaluators)) {
- Set<String> exceptionUsers = new HashSet<String>();
- Set<String> exceptionGroups = new HashSet<String>();
+ Set<String> exceptionUsers = new HashSet<>();
+ Set<String> exceptionGroups = new HashSet<>();
getResourceAccessInfo(request, allowExceptionEvaluators, exceptionUsers, exceptionGroups);
@@ -723,13 +723,13 @@ public class RangerDefaultPolicyEvaluator extends RangerAbstractPolicyEvaluator
for(RangerAccessTypeDef accessTypeDef : serviceDef.getAccessTypes()) {
if(!CollectionUtils.isEmpty(accessTypeDef.getImpliedGrants())) {
if(ret == null) {
- ret = new HashMap<String, Collection<String>>();
+ ret = new HashMap<>();
}
Collection<String> impliedAccessGrants = ret.get(accessTypeDef.getName());
if(impliedAccessGrants == null) {
- impliedAccessGrants = new HashSet<String>();
+ impliedAccessGrants = new HashSet<>();
ret.put(accessTypeDef.getName(), impliedAccessGrants);
}
@@ -777,7 +777,7 @@ public class RangerDefaultPolicyEvaluator extends RangerAbstractPolicyEvaluator
}
if(CollectionUtils.isNotEmpty(policyItems)) {
- ret = new ArrayList<RangerPolicyItemEvaluator>();
+ ret = new ArrayList<>();
int policyItemCounter = 1;
@@ -803,7 +803,7 @@ public class RangerDefaultPolicyEvaluator extends RangerAbstractPolicyEvaluator
List<RangerDataMaskPolicyItemEvaluator> ret = null;
if(CollectionUtils.isNotEmpty(policyItems)) {
- ret = new ArrayList<RangerDataMaskPolicyItemEvaluator>();
+ ret = new ArrayList<>();
int policyItemCounter = 1;
@@ -829,7 +829,7 @@ public class RangerDefaultPolicyEvaluator extends RangerAbstractPolicyEvaluator
List<RangerRowFilterPolicyItemEvaluator> ret = null;
if(CollectionUtils.isNotEmpty(policyItems)) {
- ret = new ArrayList<RangerRowFilterPolicyItemEvaluator>();
+ ret = new ArrayList<>();
int policyItemCounter = 1;
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyItemEvaluator.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyItemEvaluator.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyItemEvaluator.java
index f691c7c..c763cb5 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyItemEvaluator.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyItemEvaluator.java
@@ -51,9 +51,9 @@ public class RangerDefaultPolicyItemEvaluator extends RangerAbstractPolicyItemEv
private static final Log PERF_POLICYCONDITION_INIT_LOG = RangerPerfTracer.getPerfLogger("policycondition.init");
private static final Log PERF_POLICYCONDITION_REQUEST_LOG = RangerPerfTracer.getPerfLogger("policycondition.request");
- private boolean hasCurrentUser = false;
- private boolean hasResourceOwner = false;
- private boolean hasAllPerms = false;
+ private boolean hasCurrentUser;
+ private boolean hasResourceOwner;
+ private boolean hasAllPerms;
public RangerDefaultPolicyItemEvaluator(RangerServiceDef serviceDef, RangerPolicy policy, RangerPolicyItem policyItem, int policyItemType, int policyItemIndex, RangerPolicyEngineOptions options) {
super(serviceDef, policy, policyItem, policyItemType, policyItemIndex, options);
@@ -85,7 +85,7 @@ public class RangerDefaultPolicyItemEvaluator extends RangerAbstractPolicyItemEv
}
if (!getConditionsDisabledOption() && CollectionUtils.isNotEmpty(policyItem.getConditions())) {
- conditionEvaluators = new ArrayList<RangerConditionEvaluator>();
+ conditionEvaluators = new ArrayList<>();
RangerPerfTracer perf = null;
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/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 b8cb864..86a18ba 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
@@ -35,14 +35,14 @@ import java.util.*;
public class RangerOptimizedPolicyEvaluator extends RangerDefaultPolicyEvaluator {
private static final Log LOG = LogFactory.getLog(RangerOptimizedPolicyEvaluator.class);
- private Set<String> groups = new HashSet<String>();
- private Set<String> users = new HashSet<String>();
- private Set<String> accessPerms = new HashSet<String>();
- private boolean delegateAdmin = false;
- private boolean hasAllPerms = false;
- private boolean hasPublicGroup = false;
- private boolean hasCurrentUser = false;
- private boolean hasResourceOwner = false;
+ private Set<String> groups = new HashSet<>();
+ private Set<String> users = new HashSet<>();
+ private Set<String> accessPerms = new HashSet<>();
+ private boolean delegateAdmin;
+ private boolean hasAllPerms;
+ private boolean hasPublicGroup;
+ private boolean hasCurrentUser;
+ private boolean hasResourceOwner;
// For computation of priority
private static final String RANGER_POLICY_EVAL_MATCH_ANY_PATTERN_STRING = "*";
@@ -146,7 +146,7 @@ public class RangerOptimizedPolicyEvaluator extends RangerDefaultPolicyEvaluator
RangerServiceDef serviceDef = getServiceDef();
List<RangerServiceDef.RangerResourceDef> resourceDefs = serviceDef.getResources();
RangerPolicy policy = getPolicy();
- List<LevelResourceNames> tmpList = new ArrayList<LevelResourceNames>();
+ List<LevelResourceNames> tmpList = new ArrayList<>();
for (Map.Entry<String, RangerPolicy.RangerPolicyResource> kv : policy.getResources().entrySet()) {
String resourceName = kv.getKey();
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerResourceAccessCacheImpl.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerResourceAccessCacheImpl.java b/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerResourceAccessCacheImpl.java
index 598d172..bde65b8 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerResourceAccessCacheImpl.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/policyevaluator/RangerResourceAccessCacheImpl.java
@@ -37,8 +37,8 @@ public class RangerResourceAccessCacheImpl implements RangerResourceAccessCache
return new RangerResourceAccessCacheImpl(policy);
}
- private Map<String, String> matchedResourceCache = null;
- private Map<String, String> notMatchedResourceCache = null;
+ private Map<String, String> matchedResourceCache;
+ private Map<String, String> notMatchedResourceCache;
private RangerResourceAccessCacheImpl(RangerPolicy policy) {
if(LOG.isDebugEnabled()) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/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 18e79e0..d1c21ff 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
@@ -43,12 +43,12 @@ import com.google.common.collect.Sets;
public class RangerDefaultPolicyResourceMatcher implements RangerPolicyResourceMatcher {
private static final Log LOG = LogFactory.getLog(RangerDefaultPolicyResourceMatcher.class);
- protected RangerServiceDef serviceDef = null;
- protected RangerPolicy policy = null;
- protected Map<String, RangerPolicyResource> policyResources = null;
+ protected RangerServiceDef serviceDef;
+ protected RangerPolicy policy;
+ protected Map<String, RangerPolicyResource> policyResources;
- private Map<String, RangerResourceMatcher> matchers = null;
- private boolean needsDynamicEval = false;
+ private Map<String, RangerResourceMatcher> matchers;
+ private boolean needsDynamicEval;
private List<RangerResourceDef> firstValidResourceDefHierarchy;
/*
* For hive resource policy:
@@ -58,8 +58,7 @@ public class RangerDefaultPolicyResourceMatcher implements RangerPolicyResourceM
* 2 : database=<any>, table=employee, column=*
* 3 : database=<any>, table=<any>, column=ssn
*/
- private int lastNonAnyMatcherIndex = 0;
-
+ private int lastNonAnyMatcherIndex;
@Override
public void setServiceDef(RangerServiceDef serviceDef) {
@@ -137,8 +136,7 @@ public class RangerDefaultPolicyResourceMatcher implements RangerPolicyResourceM
firstValidResourceDefHierarchy = null;
} else {
-
- matchers = new HashMap<String, RangerResourceMatcher>();
+ matchers = new HashMap<>();
for (RangerResourceDef resourceDef : firstValidResourceDefHierarchy) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/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 38260ec..acfbf02 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
@@ -48,18 +48,18 @@ public abstract class RangerAbstractResourceMatcher implements RangerResourceMat
public final static String OPTION_TOKEN_DELIMITER_ESCAPE = "tokenDelimiterEscape";
public final static String OPTION_TOKEN_DELIMITER_PREFIX = "tokenDelimiterPrefix";
- protected RangerResourceDef resourceDef = null;
- protected RangerPolicyResource policyResource = null;
+ protected RangerResourceDef resourceDef;
+ protected RangerPolicyResource policyResource;
- protected boolean optIgnoreCase = false;
- protected boolean optWildCard = false;
+ protected boolean optIgnoreCase;
+ protected boolean optWildCard;
- protected List<String> policyValues = null;
- protected boolean policyIsExcludes = false;
- protected boolean isMatchAny = false;
- protected ResourceMatcherWrapper resourceMatchers = null;
+ protected List<String> policyValues;
+ protected boolean policyIsExcludes;
+ protected boolean isMatchAny;
+ protected ResourceMatcherWrapper resourceMatchers;
- protected boolean optReplaceTokens = false;
+ protected boolean optReplaceTokens;
protected char startDelimiterChar = '{';
protected char endDelimiterChar = '}';
protected char escapeChar = '\\';
@@ -167,7 +167,7 @@ public abstract class RangerAbstractResourceMatcher implements RangerResourceMat
return ServiceDefUtil.getOption(options, OPTION_TOKEN_DELIMITER_PREFIX, "");
}
protected ResourceMatcherWrapper buildResourceMatchers() {
- List<ResourceMatcher> resourceMatchers = new ArrayList<ResourceMatcher>();
+ List<ResourceMatcher> resourceMatchers = new ArrayList<>();
boolean needsDynamicEval = false;
for (String policyValue : policyValues) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/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 723be3d..2df0201 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
@@ -40,7 +40,7 @@ public class RangerPathResourceMatcher extends RangerDefaultResourceMatcher {
private static final String OPTION_PATH_SEPARATOR = "pathSeparatorChar";
private static final char DEFAULT_PATH_SEPARATOR_CHAR = org.apache.hadoop.fs.Path.SEPARATOR_CHAR;
- private boolean policyIsRecursive = false;
+ private boolean policyIsRecursive;
private char pathSeparatorChar = '/';
@Override
@@ -64,7 +64,7 @@ public class RangerPathResourceMatcher extends RangerDefaultResourceMatcher {
@Override
protected ResourceMatcherWrapper buildResourceMatchers() {
- List<ResourceMatcher> resourceMatchers = new ArrayList<ResourceMatcher>();
+ List<ResourceMatcher> resourceMatchers = new ArrayList<>();
boolean needsDynamicEval = false;
for (String policyValue : policyValues) {
@@ -218,8 +218,8 @@ final class CaseInsensitiveRecursiveWildcardMatcher extends ResourceMatcher {
abstract class RecursiveMatcher extends ResourceMatcher {
final char levelSeparatorChar;
- String valueWithoutSeparator = null;
- String valueWithSeparator = null;
+ String valueWithoutSeparator;
+ String valueWithSeparator;
RecursiveMatcher(String value, char levelSeparatorChar) {
super(value);
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBasePlugin.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBasePlugin.java b/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBasePlugin.java
index eda0014..acf8d15 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBasePlugin.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/service/RangerBasePlugin.java
@@ -54,15 +54,15 @@ public class RangerBasePlugin {
public static final char RANGER_TRUSTED_PROXY_IPADDRESSES_SEPARATOR_CHAR = ',';
- private String serviceType = null;
- private String appId = null;
- private String serviceName = null;
- private PolicyRefresher refresher = null;
- private RangerPolicyEngine policyEngine = null;
+ private String serviceType;
+ private String appId;
+ private String serviceName;
+ private PolicyRefresher refresher;
+ private RangerPolicyEngine policyEngine;
private RangerPolicyEngineOptions policyEngineOptions = new RangerPolicyEngineOptions();
- private RangerAccessResultProcessor resultProcessor = null;
- private boolean useForwardedIPAddress = false;
- private String[] trustedProxyAddresses = null;
+ private RangerAccessResultProcessor resultProcessor;
+ private boolean useForwardedIPAddress;
+ private String[] trustedProxyAddresses;
private Timer policyEngineRefreshTimer;
Map<String, LogHistory> logHistoryList = new Hashtable<String, RangerBasePlugin.LogHistory>();
@@ -438,8 +438,8 @@ public class RangerBasePlugin {
}
static class LogHistory {
- long lastLogTime = 0;
- int counter=0;
+ long lastLogTime;
+ int counter;
}
static private final class PolicyEngineRefresher extends TimerTask {
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/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 2c72811..df216a7 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
@@ -44,7 +44,7 @@ import org.apache.ranger.plugin.model.RangerServiceDef.RangerResourceDef;
import org.apache.ranger.plugin.util.SearchFilter;
public class AbstractPredicateUtil {
- private static Map<String, Comparator<RangerBaseModelObject>> sorterMap = new HashMap<String, Comparator<RangerBaseModelObject>>();
+ private static Map<String, Comparator<RangerBaseModelObject>> sorterMap = new HashMap<>();
public void applyFilter(List<? extends RangerBaseModelObject> objList, SearchFilter filter) {
if(CollectionUtils.isEmpty(objList)) {
@@ -69,7 +69,7 @@ public class AbstractPredicateUtil {
return null;
}
- List<Predicate> predicates = new ArrayList<Predicate>();
+ List<Predicate> predicates = new ArrayList<>();
addPredicates(filter, predicates);
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/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 121dd49..023b4f8 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
@@ -173,9 +173,9 @@ public abstract class AbstractServiceStore implements ServiceStore {
return;
}
- List<RangerServiceDef.RangerAccessTypeDef> toAdd = new ArrayList<RangerServiceDef.RangerAccessTypeDef>();
- List<RangerServiceDef.RangerAccessTypeDef> toUpdate = new ArrayList<RangerServiceDef.RangerAccessTypeDef>();
- List<RangerServiceDef.RangerAccessTypeDef> toDelete = new ArrayList<RangerServiceDef.RangerAccessTypeDef>();
+ List<RangerServiceDef.RangerAccessTypeDef> toAdd = new ArrayList<>();
+ List<RangerServiceDef.RangerAccessTypeDef> toUpdate = new ArrayList<>();
+ List<RangerServiceDef.RangerAccessTypeDef> toDelete = new ArrayList<>();
List<RangerServiceDef.RangerAccessTypeDef> svcDefAccessTypes = serviceDef.getAccessTypes();
List<RangerServiceDef.RangerAccessTypeDef> tagDefAccessTypes = tagServiceDef.getAccessTypes();
@@ -294,7 +294,7 @@ public abstract class AbstractServiceStore implements ServiceStore {
return;
}
- List<RangerServiceDef.RangerAccessTypeDef> accessTypes = new ArrayList<RangerServiceDef.RangerAccessTypeDef>();
+ List<RangerServiceDef.RangerAccessTypeDef> accessTypes = new ArrayList<>();
for (RangerServiceDef.RangerAccessTypeDef accessType : tagServiceDef.getAccessTypes()) {
if (accessType.getName().startsWith(serviceDefName + COMPONENT_ACCESSTYPE_SEPARATOR)) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/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 b13983f..07c7a1e 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
@@ -81,25 +81,24 @@ public class EmbeddedServiceDefsUtil {
private static EmbeddedServiceDefsUtil instance = new EmbeddedServiceDefsUtil();
private boolean createEmbeddedServiceDefs = true;
- private RangerServiceDef hdfsServiceDef = null;
- private RangerServiceDef hBaseServiceDef = null;
- private RangerServiceDef hiveServiceDef = null;
- private RangerServiceDef kmsServiceDef = null;
- private RangerServiceDef knoxServiceDef = null;
- private RangerServiceDef stormServiceDef = null;
- private RangerServiceDef yarnServiceDef = null;
- private RangerServiceDef kafkaServiceDef = null;
- private RangerServiceDef solrServiceDef = null;
- private RangerServiceDef nifiServiceDef = null;
- private RangerServiceDef atlasServiceDef = null;
- private RangerServiceDef wasbServiceDef = null;
-
- private RangerServiceDef tagServiceDef = null;
-
- private Gson gsonBuilder = null;
-
-
- /* private constructor to restrict instantiation of this singleton utility class */
+ private RangerServiceDef hdfsServiceDef;
+ private RangerServiceDef hBaseServiceDef;
+ private RangerServiceDef hiveServiceDef;
+ private RangerServiceDef kmsServiceDef;
+ private RangerServiceDef knoxServiceDef;
+ private RangerServiceDef stormServiceDef;
+ private RangerServiceDef yarnServiceDef;
+ private RangerServiceDef kafkaServiceDef;
+ private RangerServiceDef solrServiceDef;
+ private RangerServiceDef nifiServiceDef;
+ private RangerServiceDef atlasServiceDef;
+ private RangerServiceDef wasbServiceDef;
+
+ private RangerServiceDef tagServiceDef;
+
+ private Gson gsonBuilder;
+
+ /** Private constructor to restrict instantiation of this singleton utility class. */
private EmbeddedServiceDefsUtil() {
}
@@ -264,7 +263,7 @@ public class EmbeddedServiceDefsUtil {
}
private Set<String> getSupportedServiceDef(){
- Set<String> supportedServiceDef =new HashSet<String>();
+ Set<String> supportedServiceDef =new HashSet<>();
try{
String ranger_supportedcomponents=RangerConfiguration.getInstance().get(PROPERTY_SUPPORTED_SERVICE_DEFS, DEFAULT_BOOTSTRAP_SERVICEDEF_LIST);
if(StringUtils.isBlank(ranger_supportedcomponents) || "all".equalsIgnoreCase(ranger_supportedcomponents)){
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/main/java/org/apache/ranger/plugin/store/RangerServiceResourceSignature.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/store/RangerServiceResourceSignature.java b/agents-common/src/main/java/org/apache/ranger/plugin/store/RangerServiceResourceSignature.java
index fca1c1d..d643034 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/store/RangerServiceResourceSignature.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/store/RangerServiceResourceSignature.java
@@ -50,7 +50,7 @@ public class RangerServiceResourceSignature {
// invalid/empty serviceResource gets a deterministic signature as if it had an
// empty resource string
Map<String, RangerPolicy.RangerPolicyResource> resource = serviceResource.getResourceElements();
- Map<String, ResourceSerializer> resources = new TreeMap<String, ResourceSerializer>();
+ Map<String, ResourceSerializer> resources = new TreeMap<>();
for (Map.Entry<String, RangerPolicy.RangerPolicyResource> entry : resource.entrySet()) {
String resourceName = entry.getKey();
ResourceSerializer resourceView = new ResourceSerializer(entry.getValue());
@@ -74,7 +74,7 @@ public class RangerServiceResourceSignature {
if (_policyResource != null) {
builder.append("values=");
if (_policyResource.getValues() != null) {
- List<String> values = new ArrayList<String>(_policyResource.getValues());
+ List<String> values = new ArrayList<>(_policyResource.getValues());
Collections.sort(values);
builder.append(values);
}
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/main/java/org/apache/ranger/plugin/store/ServicePredicateUtil.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/store/ServicePredicateUtil.java b/agents-common/src/main/java/org/apache/ranger/plugin/store/ServicePredicateUtil.java
index d919697..757dc67 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/store/ServicePredicateUtil.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/store/ServicePredicateUtil.java
@@ -29,7 +29,7 @@ import org.apache.ranger.plugin.util.SearchFilter;
import java.util.List;
public class ServicePredicateUtil extends AbstractPredicateUtil {
- private ServiceStore serviceStore = null;
+ private ServiceStore serviceStore;
public ServicePredicateUtil(ServiceStore serviceStore) {
super();
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/main/java/org/apache/ranger/plugin/store/file/FileStoreUtil.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/store/file/FileStoreUtil.java b/agents-common/src/main/java/org/apache/ranger/plugin/store/file/FileStoreUtil.java
index 9d6f395..3f408d7 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/store/file/FileStoreUtil.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/store/file/FileStoreUtil.java
@@ -45,8 +45,8 @@ import com.google.gson.GsonBuilder;
public class FileStoreUtil {
private static final Log LOG = LogFactory.getLog(FileStoreUtil.class);
- private Gson gsonBuilder = null;
- private String dataDir = null;
+ private Gson gsonBuilder;
+ private String dataDir;
private static final String FILE_SUFFIX_JSON = ".json";
@@ -137,7 +137,7 @@ public class FileStoreUtil {
LOG.debug("==> FileStoreUtil.loadFromDir()");
}
- List<T> ret = new ArrayList<T>();
+ List<T> ret = new ArrayList<>();
try {
FileSystem fileSystem = getFileSystem(dirPath);
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/main/java/org/apache/ranger/plugin/store/file/GeolocationFileStore.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/store/file/GeolocationFileStore.java b/agents-common/src/main/java/org/apache/ranger/plugin/store/file/GeolocationFileStore.java
index 98ddd9c..9b55e38 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/store/file/GeolocationFileStore.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/store/file/GeolocationFileStore.java
@@ -52,8 +52,8 @@ public class GeolocationFileStore implements GeolocationStore {
private RangerGeolocationDatabase geolocationDatabase;
- private boolean isMetalineProcessed = false;
- private boolean useDotFormat = false;
+ private boolean isMetalineProcessed;
+ private boolean useDotFormat;
@Override
public void init(final Map<String, String> context) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/main/java/org/apache/ranger/plugin/util/GrantRevokeRequest.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/GrantRevokeRequest.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/GrantRevokeRequest.java
index c9b3481..33f1dd4 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/GrantRevokeRequest.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/GrantRevokeRequest.java
@@ -43,20 +43,19 @@ import org.codehaus.jackson.map.annotate.JsonSerialize;
public class GrantRevokeRequest implements Serializable {
private static final long serialVersionUID = 1L;
- private String grantor = null;
- private Map<String, String> resource = null;
- private Set<String> users = null;
- private Set<String> groups = null;
- private Set<String> accessTypes = null;
+ private String grantor;
+ private Map<String, String> resource;
+ private Set<String> users;
+ private Set<String> groups;
+ private Set<String> accessTypes;
private Boolean delegateAdmin = Boolean.FALSE;
private Boolean enableAudit = Boolean.TRUE;
private Boolean replaceExistingPermissions = Boolean.FALSE;
private Boolean isRecursive = Boolean.FALSE;
- private String clientIPAddress = null;
- private String clientType = null;
- private String requestData = null;
- private String sessionId = null;
-
+ private String clientIPAddress;
+ private String clientType;
+ private String requestData;
+ private String sessionId;
public GrantRevokeRequest() {
this(null, null, null, null, null, null, null, null, null, null, null, null, null);
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/main/java/org/apache/ranger/plugin/util/KeySearchFilter.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/KeySearchFilter.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/KeySearchFilter.java
index b9a116e..a6d5a44 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/KeySearchFilter.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/KeySearchFilter.java
@@ -33,12 +33,12 @@ public class KeySearchFilter {
public static final String PAGE_SIZE = "pageSize";
public static final String SORT_BY = "sortBy";
- private Map<String, String> params = null;
- private int startIndex = 0;
+ private Map<String, String> params;
+ private int startIndex;
private int maxRows = Integer.MAX_VALUE;
private boolean getCount = true;
- private String sortBy = null;
- private String sortType = null;
+ private String sortBy;
+ private String sortType;
public KeySearchFilter() {
this(null);
@@ -70,7 +70,7 @@ public class KeySearchFilter {
}
if(params == null) {
- params = new HashMap<String, String>();
+ params = new HashMap<>();
}
params.put(name, value);
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/main/java/org/apache/ranger/plugin/util/PerfDataRecorder.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/PerfDataRecorder.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/PerfDataRecorder.java
index 3fe96ac..25f5334 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/PerfDataRecorder.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/PerfDataRecorder.java
@@ -34,8 +34,8 @@ public class PerfDataRecorder {
private static final Log LOG = LogFactory.getLog(PerfDataRecorder.class);
private static final Log PERF = RangerPerfTracer.getPerfLogger(PerfDataRecorder.class);
- private static volatile PerfDataRecorder instance = null;
- private Map<String, PerfStatistic> perfStatistics = new HashMap<String, PerfStatistic>();
+ private static volatile PerfDataRecorder instance;
+ private Map<String, PerfStatistic> perfStatistics = new HashMap<>();
public static void initialize(List<String> names) {
if (instance == null) {
@@ -70,12 +70,11 @@ public class PerfDataRecorder {
}
private void dumpStatistics() {
- List<String> tags = new ArrayList<String>(perfStatistics.keySet());
+ List<String> tags = new ArrayList<>(perfStatistics.keySet());
Collections.sort(tags);
for (String tag : tags) {
-
PerfStatistic perfStatistic = perfStatistics.get(tag);
long averageTimeSpent = 0L;
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/main/java/org/apache/ranger/plugin/util/PolicyRefresher.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/PolicyRefresher.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/PolicyRefresher.java
index ffadf79..c5a4244 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/PolicyRefresher.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/PolicyRefresher.java
@@ -52,9 +52,8 @@ public class PolicyRefresher extends Thread {
private long pollingIntervalMs = 30 * 1000;
private long lastKnownVersion = -1L;
- private long lastActivationTimeInMillis = 0L;
- private boolean policiesSetInPlugin = false;
-
+ private long lastActivationTimeInMillis;
+ private boolean policiesSetInPlugin;
public PolicyRefresher(RangerBasePlugin plugIn, String serviceType, String appId, String serviceName, RangerAdminClient rangerAdmin, long pollingIntervalMs, String cacheDir) {
if(LOG.isDebugEnabled()) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/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 c2f0b67..f3f7ffc 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
@@ -115,9 +115,9 @@ public class RangerAccessRequestUtil {
final Map<String, Object> ret;
if(MapUtils.isEmpty(context)) {
- ret = new HashMap<String, Object>();
+ ret = new HashMap<>();
} else {
- ret = new HashMap<String, Object>(context);
+ ret = new HashMap<>(context);
ret.remove(KEY_CONTEXT_TAGS);
ret.remove(KEY_CONTEXT_TAG_OBJECT);
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerPerfTracer.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerPerfTracer.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerPerfTracer.java
index a50a47c..222c859 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerPerfTracer.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerPerfTracer.java
@@ -29,7 +29,7 @@ public class RangerPerfTracer {
protected final String data;
private final long startTimeMs;
- private static long reportingThresholdMs = 0L;
+ private static long reportingThresholdMs;
private final static String tagEndMarker = "(";
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTClient.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTClient.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTClient.java
index b093f5f..ab2d383 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTClient.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerRESTClient.java
@@ -81,23 +81,23 @@ public class RangerRESTClient {
public static final String RANGER_SSL_TRUSTMANAGER_ALGO_TYPE = "SunX509";
public static final String RANGER_SSL_CONTEXT_ALGO_TYPE = "SSL";
- private String mUrl = null;
- private String mSslConfigFileName = null;
- private String mUsername = null;
- private String mPassword = null;
- private boolean mIsSSL = false;
-
- private String mKeyStoreURL = null;
- private String mKeyStoreAlias = null;
- private String mKeyStoreFile = null;
- private String mKeyStoreType = null;
- private String mTrustStoreURL = null;
- private String mTrustStoreAlias = null;
- private String mTrustStoreFile = null;
- private String mTrustStoreType = null;
-
- private Gson gsonBuilder = null;
- private volatile Client client = null;
+ private String mUrl;
+ private String mSslConfigFileName;
+ private String mUsername;
+ private String mPassword;
+ private boolean mIsSSL;
+
+ private String mKeyStoreURL;
+ private String mKeyStoreAlias;
+ private String mKeyStoreFile;
+ private String mKeyStoreType;
+ private String mTrustStoreURL;
+ private String mTrustStoreAlias;
+ private String mTrustStoreFile;
+ private String mTrustStoreType;
+
+ private Gson gsonBuilder;
+ private volatile Client client;
private int mRestClientConnTimeOutMs;
private int mRestClientReadTimeOutMs;
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/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 cb3b84a..c73d68a 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
@@ -40,7 +40,7 @@ import java.util.Map;
@XmlAccessorType(XmlAccessType.FIELD)
public class RangerRequestedResources {
- private List<RangerAccessResource> requestedResources = new ArrayList<RangerAccessResource>();
+ private List<RangerAccessResource> requestedResources = new ArrayList<>();
public RangerRequestedResources() {
}
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/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 b5c8fb0..bb4d145 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
@@ -225,23 +225,23 @@ public class RangerResourceTrie<T extends RangerPolicyResourceEvaluator> {
}
public class TrieData {
- int nodeCount = 0;
- int leafNodeCount = 0;
- int singleChildNodeCount = 0;
- int maxDepth = 0;
- int evaluatorListCount = 0;
- int wildcardEvaluatorListCount = 0;
- int evaluatorListRefCount = 0;
- int wildcardEvaluatorListRefCount = 0;
+ int nodeCount;
+ int leafNodeCount;
+ int singleChildNodeCount;
+ int maxDepth;
+ int evaluatorListCount;
+ int wildcardEvaluatorListCount;
+ int evaluatorListRefCount;
+ int wildcardEvaluatorListRefCount;
}
}
class TrieNode<T extends RangerPolicyResourceEvaluator> {
private final Character c;
- private Map<Character, TrieNode> children = null;
- private List<T> evaluators = null;
- private List<T> wildcardEvaluators = null;
- private boolean isSharingParentWildcardEvaluators = false;
+ private Map<Character, TrieNode> children;
+ private List<T> evaluators;
+ private List<T> wildcardEvaluators;
+ private boolean isSharingParentWildcardEvaluators;
TrieNode(Character c) {
this.c = c;
@@ -323,7 +323,7 @@ class TrieNode<T extends RangerPolicyResourceEvaluator> {
TrieNode getOrCreateChild(Character c) {
if(children == null) {
- children = new HashMap<Character, TrieNode>();
+ children = new HashMap<>();
}
TrieNode child = children.get(c);
@@ -338,7 +338,7 @@ class TrieNode<T extends RangerPolicyResourceEvaluator> {
void addEvaluator(T evaluator) {
if(evaluators == null) {
- evaluators = new ArrayList<T>();
+ evaluators = new ArrayList<>();
}
if(!evaluators.contains(evaluator)) {
@@ -348,7 +348,7 @@ class TrieNode<T extends RangerPolicyResourceEvaluator> {
void addWildcardEvaluator(T evaluator) {
if(wildcardEvaluators == null) {
- wildcardEvaluators = new ArrayList<T>();
+ wildcardEvaluators = new ArrayList<>();
}
if(!wildcardEvaluators.contains(evaluator)) {
@@ -466,7 +466,7 @@ class TrieNode<T extends RangerPolicyResourceEvaluator> {
final List<T> ret;
if(CollectionUtils.isNotEmpty(evaluators)) {
- ret = new ArrayList<T>(evaluators);
+ ret = new ArrayList<>(evaluators);
Collections.sort(ret);
} else {
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerSslHelper.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerSslHelper.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerSslHelper.java
index ee8a34e..e0b0fd0 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerSslHelper.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/RangerSslHelper.java
@@ -67,14 +67,14 @@ public class RangerSslHelper {
static final String RANGER_SSL_TRUSTMANAGER_ALGO_TYPE = "SunX509";
static final String RANGER_SSL_CONTEXT_ALGO_TYPE = "SSL";
- private String mKeyStoreURL = null;
- private String mKeyStoreAlias = null;
- private String mKeyStoreFile = null;
- private String mKeyStoreType = null;
- private String mTrustStoreURL = null;
- private String mTrustStoreAlias = null;
- private String mTrustStoreFile = null;
- private String mTrustStoreType = null;
+ private String mKeyStoreURL;
+ private String mKeyStoreAlias;
+ private String mKeyStoreFile;
+ private String mKeyStoreType;
+ private String mTrustStoreURL;
+ private String mTrustStoreAlias;
+ private String mTrustStoreFile;
+ private String mTrustStoreType;
final static HostnameVerifier _Hv = new HostnameVerifier() {
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/main/java/org/apache/ranger/plugin/util/SearchFilter.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/util/SearchFilter.java b/agents-common/src/main/java/org/apache/ranger/plugin/util/SearchFilter.java
index 73ea6e9..8f6426c 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/util/SearchFilter.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/util/SearchFilter.java
@@ -71,12 +71,12 @@ public class SearchFilter {
public static final String PLUGIN_ENTITY_TYPE = "pluginEntityType";
public static final String PLUGIN_IP_ADDRESS = "pluginIpAddress";
- private Map<String, String> params = null;
- private int startIndex = 0;
+ private Map<String, String> params;
+ private int startIndex;
private int maxRows = Integer.MAX_VALUE;
private boolean getCount = true;
- private String sortBy = null;
- private String sortType = null;
+ private String sortBy;
+ private String sortType;
public SearchFilter() {
this(null);
@@ -131,7 +131,7 @@ public class SearchFilter {
if(name.startsWith(prefix)) {
if(ret == null) {
- ret = new HashMap<String, String>();
+ ret = new HashMap<>();
}
if(stripPrefix) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/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 3940154..859cdd9 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
@@ -39,8 +39,7 @@ public class RangerServiceTag extends RangerBaseService {
public static final String TAG_RESOURCE_NAME = "tag";
- private TagStore tagStore = null;
-
+ private TagStore tagStore;
public RangerServiceTag() {
super();
@@ -61,7 +60,7 @@ public class RangerServiceTag extends RangerBaseService {
LOG.debug("==> RangerServiceTag.validateConfig(" + serviceName + " )");
}
- HashMap<String, Object> ret = new HashMap<String, Object>();
+ HashMap<String, Object> ret = new HashMap<>();
ret.put("connectivityStatus", true);
@@ -78,7 +77,7 @@ public class RangerServiceTag extends RangerBaseService {
LOG.debug("==> RangerServiceTag.lookupResource(" + context + ")");
}
- List<String> ret = new ArrayList<String>();
+ List<String> ret = new ArrayList<>();
if (context != null && StringUtils.equals(context.getResourceName(), TAG_RESOURCE_NAME)) {
try {
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/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 b9c734a..ed96773 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
@@ -36,9 +36,9 @@ public class RangerSimpleMatcher extends RangerAbstractConditionEvaluator {
public static final String CONTEXT_NAME = "CONTEXT_NAME";
- private boolean _allowAny = false;
- private String _contextName = null;
- private List<String> _values = new ArrayList<String>();
+ private boolean _allowAny;
+ private String _contextName;
+ private List<String> _values = new ArrayList<>();
@Override
public void init() {
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/test/java/org/apache/ranger/plugin/contextenricher/TestTagEnricher.java
----------------------------------------------------------------------
diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/contextenricher/TestTagEnricher.java b/agents-common/src/test/java/org/apache/ranger/plugin/contextenricher/TestTagEnricher.java
index a399fd3..4cca8ce 100644
--- a/agents-common/src/test/java/org/apache/ranger/plugin/contextenricher/TestTagEnricher.java
+++ b/agents-common/src/test/java/org/apache/ranger/plugin/contextenricher/TestTagEnricher.java
@@ -50,7 +50,7 @@ import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
public class TestTagEnricher {
- static Gson gsonBuilder = null;
+ static Gson gsonBuilder;
@BeforeClass
public static void setUpBeforeClass() throws Exception {
@@ -98,9 +98,8 @@ public class TestTagEnricher {
tagEnricher.setServiceDef(testCase.serviceDef);
tagEnricher.setServiceTags(serviceTags);
- List<String> expectedTags = new ArrayList<String>();
- List<String> resultTags = new ArrayList<String>();
-
+ List<String> expectedTags = new ArrayList<>();
+ List<String> resultTags = new ArrayList<>();
for (TestData test : testCase.tests) {
RangerAccessRequestImpl request = new RangerAccessRequestImpl(test.resource, test.accessType, "testUser", null);
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/test/java/org/apache/ranger/plugin/errors/TestValidationErrorCode.java
----------------------------------------------------------------------
diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/errors/TestValidationErrorCode.java b/agents-common/src/test/java/org/apache/ranger/plugin/errors/TestValidationErrorCode.java
index 9336377..1b00c64 100644
--- a/agents-common/src/test/java/org/apache/ranger/plugin/errors/TestValidationErrorCode.java
+++ b/agents-common/src/test/java/org/apache/ranger/plugin/errors/TestValidationErrorCode.java
@@ -54,7 +54,7 @@ public class TestValidationErrorCode {
Set<ValidationErrorCode> may = ImmutableSet.copyOf(ValidationErrorCode.values());
// set of enums that must not hvae any subsequent placeholders in it
- Set<ValidationErrorCode> mustNot = new HashSet<ValidationErrorCode>();
+ Set<ValidationErrorCode> mustNot = new HashSet<>();
for (int i = 0; i < 5; i++) {
String token = String.format("{%d", i);
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/test/java/org/apache/ranger/plugin/model/TestRangerPolicy.java
----------------------------------------------------------------------
diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/model/TestRangerPolicy.java b/agents-common/src/test/java/org/apache/ranger/plugin/model/TestRangerPolicy.java
index cf0daef..57e710e 100644
--- a/agents-common/src/test/java/org/apache/ranger/plugin/model/TestRangerPolicy.java
+++ b/agents-common/src/test/java/org/apache/ranger/plugin/model/TestRangerPolicy.java
@@ -121,7 +121,7 @@ public class TestRangerPolicy {
}
private <T> List<T> getList(T value) {
- List<T> ret = new ArrayList<T>();
+ List<T> ret = new ArrayList<>();
int count = getRandomNumber(10);
for(int i = 0; i < count; i ++) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/test/java/org/apache/ranger/plugin/model/TestRangerPolicyResourceSignature.java
----------------------------------------------------------------------
diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/model/TestRangerPolicyResourceSignature.java b/agents-common/src/test/java/org/apache/ranger/plugin/model/TestRangerPolicyResourceSignature.java
index eae8aa5..345b260 100644
--- a/agents-common/src/test/java/org/apache/ranger/plugin/model/TestRangerPolicyResourceSignature.java
+++ b/agents-common/src/test/java/org/apache/ranger/plugin/model/TestRangerPolicyResourceSignature.java
@@ -87,7 +87,7 @@ public class TestRangerPolicyResourceSignature {
Assert.assertFalse("policy.getResources()==null", policySerializer.isPolicyValidForResourceSignatureComputation());
// empty resources map is ok!
- Map<String, RangerPolicyResource> policyResources = new HashMap<String, RangerPolicyResource>();
+ Map<String, RangerPolicyResource> policyResources = new HashMap<>();
when(rangerPolicy.getResources()).thenReturn(policyResources);
policySerializer = new PolicySerializer(rangerPolicy);
Assert.assertTrue("policy.getResources().isEmpty()", policySerializer.isPolicyValidForResourceSignatureComputation());
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerPolicyValidator.java
----------------------------------------------------------------------
diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerPolicyValidator.java b/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerPolicyValidator.java
index caa8e35..713c588 100644
--- a/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerPolicyValidator.java
+++ b/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerPolicyValidator.java
@@ -248,7 +248,7 @@ public class TestRangerPolicyValidator {
SearchFilter updateFilter = new SearchFilter();
updateFilter.setParam(SearchFilter.SERVICE_TYPE, "service-type");
updateFilter.setParam(SearchFilter.POLICY_NAME, "policy-name-2"); // this name would be used for update
- List<RangerPolicy> existingPolicies = new ArrayList<RangerPolicy>();
+ List<RangerPolicy> existingPolicies = new ArrayList<>();
existingPolicies.add(existingPolicy);
when(_store.getPolicies(updateFilter)).thenReturn(existingPolicies);
// valid policy can have empty set of policy items if audit is turned on
@@ -378,7 +378,7 @@ public class TestRangerPolicyValidator {
RangerPolicy existingPolicy = mock(RangerPolicy.class);
when(existingPolicy.getId()).thenReturn(7L);
- List<RangerPolicy> existingPolicies = new ArrayList<RangerPolicy>();
+ List<RangerPolicy> existingPolicies = new ArrayList<>();
existingPolicies.add(existingPolicy);
SearchFilter filter = new SearchFilter();
filter.setParam(SearchFilter.SERVICE_NAME, "service-name");
@@ -449,7 +449,7 @@ public class TestRangerPolicyValidator {
}
// policy must contain at least one policy item
- List<RangerPolicyItem> policyItems = new ArrayList<RangerPolicy.RangerPolicyItem>();
+ List<RangerPolicyItem> policyItems = new ArrayList<>();
when(_policy.getService()).thenReturn("service-name");
RangerService service = mock(RangerService.class);
when(_store.getServiceByName("service-name")).thenReturn(service);
@@ -551,7 +551,7 @@ public class TestRangerPolicyValidator {
Assert.assertTrue(_validator.isValidPolicyItems(null, _failures, _serviceDef));
_failures.isEmpty();
- List<RangerPolicyItem> policyItems = new ArrayList<RangerPolicy.RangerPolicyItem>();
+ List<RangerPolicyItem> policyItems = new ArrayList<>();
Assert.assertTrue(_validator.isValidPolicyItems(policyItems, _failures, _serviceDef));
_failures.isEmpty();
@@ -563,14 +563,13 @@ public class TestRangerPolicyValidator {
@Test
public void test_isValidPolicyItem_failures() {
-
// empty access collections are invalid
RangerPolicyItem policyItem = mock(RangerPolicyItem.class);
when(policyItem.getAccesses()).thenReturn(null);
_failures.clear(); Assert.assertFalse(_validator.isValidPolicyItem(policyItem, _failures, _serviceDef));
_utils.checkFailureForMissingValue(_failures, "policy item accesses");
- List<RangerPolicyItemAccess> accesses = new ArrayList<RangerPolicy.RangerPolicyItemAccess>();
+ List<RangerPolicyItemAccess> accesses = new ArrayList<>();
when(policyItem.getAccesses()).thenReturn(accesses);
_failures.clear(); Assert.assertFalse(_validator.isValidPolicyItem(policyItem, _failures, _serviceDef));
_utils.checkFailureForMissingValue(_failures, "policy item accesses");
@@ -613,9 +612,8 @@ public class TestRangerPolicyValidator {
@Test
public void test_isValidItemAccesses_failure() {
-
// null policy item access values are an error
- List<RangerPolicyItemAccess> accesses = new ArrayList<RangerPolicyItemAccess>();
+ List<RangerPolicyItemAccess> accesses = new ArrayList<>();
accesses.add(null);
_failures.clear(); Assert.assertFalse(_validator.isValidItemAccesses(accesses, _failures, _serviceDef));
_utils.checkFailureForMissingValue(_failures, "policy item access");
@@ -733,7 +731,7 @@ public class TestRangerPolicyValidator {
when(_policy.getService()).thenReturn("service-name");
List<RangerPolicy> policies = null;
when(_store.getPoliciesByResourceSignature("service-name", hash, true)).thenReturn(policies);
- policies = new ArrayList<RangerPolicy>();
+ policies = new ArrayList<>();
for (Action action : cu) {
Assert.assertTrue(_validator.isPolicyResourceUnique(_policy, _failures, action));
Assert.assertTrue(_validator.isPolicyResourceUnique(_policy, _failures, action));