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:54 UTC
[1/3] ranger git commit: RANGER-1371 : Remove unneded field
initializers, and unnecessary generic type informations
Repository: ranger
Updated Branches:
refs/heads/master 525098460 -> 691c01f53
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerServiceDefHelper.java
----------------------------------------------------------------------
diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerServiceDefHelper.java b/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerServiceDefHelper.java
index ae42652..f414d2e 100644
--- a/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerServiceDefHelper.java
+++ b/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerServiceDefHelper.java
@@ -139,7 +139,7 @@ public class TestRangerServiceDefHelper {
assertTrue(_helper.isResourceGraphValid());
Set<List<RangerResourceDef>> hierarchies = _helper.getResourceHierarchies(RangerPolicy.POLICY_TYPE_ACCESS);
- Set<List<String>> expectedHierarchies = new HashSet<List<String>>();
+ Set<List<String>> expectedHierarchies = new HashSet<>();
expectedHierarchies.add(Lists.newArrayList("database", "table-space"));
expectedHierarchies.add(Lists.newArrayList("database", "table", "column"));
expectedHierarchies.add(Lists.newArrayList("namespace", "package"));
@@ -180,7 +180,7 @@ public class TestRangerServiceDefHelper {
assertTrue(_helper.isResourceGraphValid());
Set<List<RangerResourceDef>> hierarchies = _helper.getResourceHierarchies(RangerPolicy.POLICY_TYPE_ACCESS);
- Set<List<String>> expectedHierarchies = new HashSet<List<String>>();
+ Set<List<String>> expectedHierarchies = new HashSet<>();
expectedHierarchies.add(Lists.newArrayList("database"));
expectedHierarchies.add(Lists.newArrayList("server"));
expectedHierarchies.add(Lists.newArrayList("namespace", "package"));
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerServiceDefValidator.java
----------------------------------------------------------------------
diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerServiceDefValidator.java b/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerServiceDefValidator.java
index 33e6f4a..ca055ff 100644
--- a/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerServiceDefValidator.java
+++ b/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerServiceDefValidator.java
@@ -47,7 +47,7 @@ public class TestRangerServiceDefValidator {
public void setUp() throws Exception {
_store = mock(ServiceStore.class);
_validator = new RangerServiceDefValidator(_store);
- _failures = new ArrayList<ValidationFailureDetails>();
+ _failures = new ArrayList<>();
_serviceDef = mock(RangerServiceDef.class);
}
@@ -223,7 +223,7 @@ public class TestRangerServiceDefValidator {
_failures.clear(); assertFalse(_validator.isValidAccessTypes(accessTypeDefs, _failures));
_utils.checkFailureForMissingValue(_failures, "access types");
- accessTypeDefs = new ArrayList<RangerAccessTypeDef>();
+ accessTypeDefs = new ArrayList<>();
_failures.clear(); assertFalse(_validator.isValidAccessTypes(accessTypeDefs, _failures));
_utils.checkFailureForMissingValue(_failures, "access types");
@@ -399,7 +399,7 @@ public class TestRangerServiceDefValidator {
_failures.clear(); assertFalse(_validator.isValidResources(_serviceDef, _failures));
_utils.checkFailureForMissingValue(_failures, "resources");
- List<RangerResourceDef> resources = new ArrayList<RangerResourceDef>();
+ List<RangerResourceDef> resources = new ArrayList<>();
when(_serviceDef.getResources()).thenReturn(resources);
_failures.clear(); assertFalse(_validator.isValidResources(_serviceDef, _failures));
_utils.checkFailureForMissingValue(_failures, "resources");
@@ -493,7 +493,7 @@ public class TestRangerServiceDefValidator {
// null/empty policy conditions are ok
assertTrue(_validator.isValidPolicyConditions(null, _failures));
assertTrue(_failures.isEmpty());
- List<RangerPolicyConditionDef> conditionDefs = new ArrayList<RangerServiceDef.RangerPolicyConditionDef>();
+ List<RangerPolicyConditionDef> conditionDefs = new ArrayList<>();
assertTrue(_validator.isValidPolicyConditions(conditionDefs, _failures));
assertTrue(_failures.isEmpty());
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerServiceValidator.java
----------------------------------------------------------------------
diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerServiceValidator.java b/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerServiceValidator.java
index 40af3ce..64ccb7d 100644
--- a/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerServiceValidator.java
+++ b/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/TestRangerServiceValidator.java
@@ -232,5 +232,5 @@ public class TestRangerServiceValidator {
private RangerServiceValidator _validator;
private Action _action;
private ValidationTestUtils _utils = new ValidationTestUtils();
- private List<ValidationFailureDetails> _failures = new ArrayList<ValidationFailureDetails>();
+ private List<ValidationFailureDetails> _failures = new ArrayList<>();
}
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/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 5519a2c..1728c22 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
@@ -73,7 +73,7 @@ public class TestRangerValidator {
public void before() {
_store = mock(ServiceStore.class);
_validator = new RangerValidatorForTest(_store);
- _failures = new ArrayList<ValidationFailureDetails>();
+ _failures = new ArrayList<>();
}
@Test
@@ -140,7 +140,7 @@ public class TestRangerValidator {
Assert.assertNotNull(parameters);
Assert.assertTrue(parameters.isEmpty());
- List<RangerServiceConfigDef> configs = new ArrayList<RangerServiceDef.RangerServiceConfigDef>();
+ List<RangerServiceConfigDef> configs = new ArrayList<>();
when(serviceDef.getConfigs()).thenReturn(configs);
parameters = _validator.getRequiredParameters(null);
Assert.assertNotNull(parameters);
@@ -203,7 +203,7 @@ public class TestRangerValidator {
// what ever store returns should come back
hexSignature = "anotherSignature";
- List<RangerPolicy> policies = new ArrayList<RangerPolicy>();
+ List<RangerPolicy> policies = new ArrayList<>();
RangerPolicy policy1 = mock(RangerPolicy.class);
policies.add(policy1);
RangerPolicy policy2 = mock(RangerPolicy.class);
@@ -255,7 +255,7 @@ public class TestRangerValidator {
accessTypes = _validator.getAccessTypes(serviceDef);
Assert.assertTrue(accessTypes.isEmpty());
- List<RangerAccessTypeDef> accessTypeDefs = new ArrayList<RangerServiceDef.RangerAccessTypeDef>();
+ List<RangerAccessTypeDef> accessTypeDefs = new ArrayList<>();
when(serviceDef.getAccessTypes()).thenReturn(accessTypeDefs);
accessTypes = _validator.getAccessTypes(serviceDef);
Assert.assertTrue(accessTypes.isEmpty());
@@ -287,7 +287,7 @@ public class TestRangerValidator {
accessTypes = _validator.getMandatoryResourceNames(serviceDef);
Assert.assertTrue(accessTypes.isEmpty());
- List<RangerResourceDef> resourceDefs = new ArrayList<RangerResourceDef>();
+ List<RangerResourceDef> resourceDefs = new ArrayList<>();
when(serviceDef.getResources()).thenReturn(resourceDefs);
accessTypes = _validator.getMandatoryResourceNames(serviceDef);
Assert.assertTrue(accessTypes.isEmpty());
@@ -332,7 +332,7 @@ public class TestRangerValidator {
regExMap = _validator.getValidationRegExes(serviceDef);
Assert.assertTrue(regExMap.isEmpty());
- List<RangerResourceDef> resourceDefs = new ArrayList<RangerResourceDef>();
+ List<RangerResourceDef> resourceDefs = new ArrayList<>();
when(serviceDef.getResources()).thenReturn(resourceDefs);
regExMap = _validator.getValidationRegExes(serviceDef);
Assert.assertTrue(regExMap.isEmpty());
@@ -436,7 +436,7 @@ public class TestRangerValidator {
filter = new SearchFilter();
filter.setParam(SearchFilter.SERVICE_NAME, serviceName);
- List<RangerPolicy> policies = new ArrayList<RangerPolicy>();
+ List<RangerPolicy> policies = new ArrayList<>();
RangerPolicy policy = mock(RangerPolicy.class);
policies.add(policy);
@@ -483,7 +483,7 @@ public class TestRangerValidator {
result = _validator.getImpliedGrants(accessTypeDef);
Assert.assertTrue(result.isEmpty());
- List<String> impliedGrants = new ArrayList<String>();
+ List<String> impliedGrants = new ArrayList<>();
when(accessTypeDef.getImpliedGrants()).thenReturn(impliedGrants);
result = _validator.getImpliedGrants(accessTypeDef);
Assert.assertTrue(result.isEmpty());
@@ -509,7 +509,7 @@ public class TestRangerValidator {
public void test_isValid_string() {
String fieldName = "value-field-Name";
String collectionName = "value-collection-Name";
- Set<String> alreadySeen = new HashSet<String>();
+ Set<String> alreadySeen = new HashSet<>();
// null/empty string value is invalid
for (String value : new String[] { null, "", " " }) {
Assert.assertFalse(_validator.isUnique(value, alreadySeen, fieldName, collectionName, _failures));
@@ -535,7 +535,7 @@ public class TestRangerValidator {
public void test_isValid_long() {
String fieldName = "field-Name";
String collectionName = "field-collection-Name";
- Set<Long> alreadySeen = new HashSet<Long>();
+ Set<Long> alreadySeen = new HashSet<>();
Long value = null;
// null value is invalid
Assert.assertFalse(_validator.isUnique(value, alreadySeen, fieldName, collectionName, _failures));
@@ -556,7 +556,7 @@ public class TestRangerValidator {
public void test_isValid_integer() {
String fieldName = "field-Name";
String collectionName = "field-collection-Name";
- Set<Integer> alreadySeen = new HashSet<Integer>();
+ Set<Integer> alreadySeen = new HashSet<>();
Integer value = null;
// null value is invalid
Assert.assertFalse(_validator.isUnique(value, alreadySeen, fieldName, collectionName, _failures));
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/ValidationTestUtils.java
----------------------------------------------------------------------
diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/ValidationTestUtils.java b/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/ValidationTestUtils.java
index 5570ce5..3b0711b 100644
--- a/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/ValidationTestUtils.java
+++ b/agents-common/src/test/java/org/apache/ranger/plugin/model/validation/ValidationTestUtils.java
@@ -44,7 +44,7 @@ import org.junit.Assert;
public class ValidationTestUtils {
Map<String, String> createMap(String[] keys) {
- Map<String, String> result = new HashMap<String, String>();
+ Map<String, String> result = new HashMap<>();
for (String key : keys) {
result.put(key, "valueof-" + key);
}
@@ -53,7 +53,7 @@ public class ValidationTestUtils {
// helper methods for tests
List<RangerServiceConfigDef> createServiceConditionDefs(Object[][] input) {
- List<RangerServiceConfigDef> result = new ArrayList<RangerServiceDef.RangerServiceConfigDef>();
+ List<RangerServiceConfigDef> result = new ArrayList<>();
for (Object data[] : input) {
RangerServiceConfigDef aConfigDef = mock(RangerServiceConfigDef.class);
@@ -141,12 +141,11 @@ public class ValidationTestUtils {
return defs;
}
-
List<RangerAccessTypeDef> createAccessTypeDefs(Object[][] data) {
if (data == null) {
return null;
}
- List<RangerAccessTypeDef> result = new ArrayList<RangerAccessTypeDef>();
+ List<RangerAccessTypeDef> result = new ArrayList<>();
if (data.length == 0) {
return result;
}
@@ -175,7 +174,7 @@ public class ValidationTestUtils {
RangerServiceDef createServiceDefWithAccessTypes(String[] accesses) {
RangerServiceDef serviceDef = mock(RangerServiceDef.class);
- List<RangerAccessTypeDef> accessTypeDefs = new ArrayList<RangerServiceDef.RangerAccessTypeDef>();
+ List<RangerAccessTypeDef> accessTypeDefs = new ArrayList<>();
for (String access : accesses) {
RangerAccessTypeDef accessTypeDef = mock(RangerAccessTypeDef.class);
when(accessTypeDef.getName()).thenReturn(access);
@@ -186,7 +185,7 @@ public class ValidationTestUtils {
}
List<RangerPolicyItemAccess> createItemAccess(Object[][] data) {
- List<RangerPolicyItemAccess> accesses = new ArrayList<RangerPolicyItemAccess>();
+ List<RangerPolicyItemAccess> accesses = new ArrayList<>();
for (Object[] row : data) {
RangerPolicyItemAccess access = mock(RangerPolicyItemAccess.class);
when(access.getType()).thenReturn((String)row[0]);
@@ -197,7 +196,7 @@ public class ValidationTestUtils {
}
List<RangerPolicyItem> createPolicyItems(Object[] data) {
- List<RangerPolicyItem> policyItems = new ArrayList<RangerPolicyItem>();
+ List<RangerPolicyItem> policyItems = new ArrayList<>();
for (Object object : data) {
@SuppressWarnings("unchecked")
Map<String, Object[]> map = (Map<String, Object[]>) object;
@@ -219,7 +218,7 @@ public class ValidationTestUtils {
Boolean[] isAllowedFlags = (Boolean[])map.get("isAllowed");
List<RangerPolicyItemAccess> accessesList = null;
if (accesses != null && isAllowedFlags != null) {
- accessesList = new ArrayList<RangerPolicyItemAccess>();
+ accessesList = new ArrayList<>();
for (int i = 0; i < accesses.length; i++) {
String access = accesses[i];
Boolean isAllowed = isAllowedFlags[i];
@@ -241,7 +240,7 @@ public class ValidationTestUtils {
if (data == null) {
return null;
}
- List<RangerResourceDef> defs = new ArrayList<RangerResourceDef>();
+ List<RangerResourceDef> defs = new ArrayList<>();
for (Object[] row : data) {
RangerResourceDef aDef = null;
if (row != null) {
@@ -287,7 +286,7 @@ public class ValidationTestUtils {
if (data == null) {
return null;
}
- List<RangerResourceDef> defs = new ArrayList<RangerResourceDef>();
+ List<RangerResourceDef> defs = new ArrayList<>();
for (String[] row : data) {
RangerResourceDef aDef = null;
if (row != null) {
@@ -307,7 +306,7 @@ public class ValidationTestUtils {
if (data == null) {
return null;
}
- List<RangerResourceDef> defs = new ArrayList<RangerResourceDef>();
+ List<RangerResourceDef> defs = new ArrayList<>();
for (Object[] row : data) {
RangerResourceDef aDef = null;
if (row != null) {
@@ -339,7 +338,7 @@ public class ValidationTestUtils {
if (input == null) {
return null;
}
- List<RangerEnumElementDef> output = new ArrayList<RangerEnumElementDef>();
+ List<RangerEnumElementDef> output = new ArrayList<>();
for (Object[] row : input) {
RangerEnumElementDef aDef = mock(RangerEnumElementDef.class);
switch(row.length) {
@@ -357,7 +356,7 @@ public class ValidationTestUtils {
if (input == null) {
return null;
}
- List<RangerEnumDef> defs = new ArrayList<RangerEnumDef>();
+ List<RangerEnumDef> defs = new ArrayList<>();
for (Object[] row : input) {
RangerEnumDef enumDef = mock(RangerEnumDef.class);
switch (row.length) {
@@ -404,7 +403,7 @@ public class ValidationTestUtils {
if (input == null) {
return null;
}
- List<RangerServiceConfigDef> result = new ArrayList<RangerServiceDef.RangerServiceConfigDef>();
+ List<RangerServiceConfigDef> result = new ArrayList<>();
for (Object[] row : input) {
RangerServiceConfigDef configDef = mock(RangerServiceConfigDef.class);
switch(row.length) {
@@ -428,7 +427,7 @@ public class ValidationTestUtils {
}
List<RangerPolicyConditionDef> createPolicyConditionDefs(Object[][] input) {
- List<RangerPolicyConditionDef> result = new ArrayList<RangerServiceDef.RangerPolicyConditionDef>();
+ List<RangerPolicyConditionDef> result = new ArrayList<>();
if (input != null) {
for (Object[] row : input) {
RangerPolicyConditionDef conditionDef = mock(RangerPolicyConditionDef.class);
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/test/java/org/apache/ranger/plugin/policyengine/TestCacheMap.java
----------------------------------------------------------------------
diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/policyengine/TestCacheMap.java b/agents-common/src/test/java/org/apache/ranger/plugin/policyengine/TestCacheMap.java
index 19362f2..5f39b22 100644
--- a/agents-common/src/test/java/org/apache/ranger/plugin/policyengine/TestCacheMap.java
+++ b/agents-common/src/test/java/org/apache/ranger/plugin/policyengine/TestCacheMap.java
@@ -30,10 +30,9 @@ import java.util.Set;
public class TestCacheMap {
private static final Log LOG = LogFactory.getLog(TestCacheMap.class);
- private static CacheMap<String, String> testCacheMap = null;
+ private static CacheMap<String, String> testCacheMap;
private static int initialCapacity = 16;
-
@BeforeClass
public static void setUpBeforeClass() throws Exception {
if(LOG.isDebugEnabled()) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/test/java/org/apache/ranger/plugin/policyengine/TestPolicyDb.java
----------------------------------------------------------------------
diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/policyengine/TestPolicyDb.java b/agents-common/src/test/java/org/apache/ranger/plugin/policyengine/TestPolicyDb.java
index 097e6ff..58bb351 100644
--- a/agents-common/src/test/java/org/apache/ranger/plugin/policyengine/TestPolicyDb.java
+++ b/agents-common/src/test/java/org/apache/ranger/plugin/policyengine/TestPolicyDb.java
@@ -42,8 +42,7 @@ import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
public class TestPolicyDb {
- static Gson gsonBuilder = null;
-
+ static Gson gsonBuilder;
@BeforeClass
public static void setUpBeforeClass() throws Exception {
@@ -95,7 +94,7 @@ public class TestPolicyDb {
assertEquals("allowed-policy count mismatch!", test.allowedPolicies.size(), allowedPolicies.size());
- Set<Long> allowedPolicyIds = new HashSet<Long>();
+ Set<Long> allowedPolicyIds = new HashSet<>();
for(RangerPolicy allowedPolicy : allowedPolicies) {
allowedPolicyIds.add(allowedPolicy.getId());
}
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/test/java/org/apache/ranger/plugin/policyengine/TestPolicyEngine.java
----------------------------------------------------------------------
diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/policyengine/TestPolicyEngine.java b/agents-common/src/test/java/org/apache/ranger/plugin/policyengine/TestPolicyEngine.java
index b0d103e..87b5830 100644
--- a/agents-common/src/test/java/org/apache/ranger/plugin/policyengine/TestPolicyEngine.java
+++ b/agents-common/src/test/java/org/apache/ranger/plugin/policyengine/TestPolicyEngine.java
@@ -57,9 +57,8 @@ import java.util.Set;
import static org.junit.Assert.*;
-
public class TestPolicyEngine {
- static Gson gsonBuilder = null;
+ static Gson gsonBuilder;
@BeforeClass
public static void setUpBeforeClass() throws Exception {
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/test/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyEvaluatorTest.java
----------------------------------------------------------------------
diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyEvaluatorTest.java b/agents-common/src/test/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyEvaluatorTest.java
index 769e205..4fc63da 100644
--- a/agents-common/src/test/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyEvaluatorTest.java
+++ b/agents-common/src/test/java/org/apache/ranger/plugin/policyevaluator/RangerDefaultPolicyEvaluatorTest.java
@@ -87,14 +87,14 @@ public class RangerDefaultPolicyEvaluatorTest {
// takes in a map of condition name to a an two element array where 1st element is evaluator-class-name and second is evaluator-options if any
List<RangerPolicyConditionDef> getMockPolicyConditionDefs(Map<String, String[]> pairs) {
- List<RangerPolicyConditionDef> conditions = new ArrayList<RangerServiceDef.RangerPolicyConditionDef>();
+ List<RangerPolicyConditionDef> conditions = new ArrayList<>();
// null policy condition def collection should behave sensibly
for (Map.Entry<String, String[]> anEntry : pairs.entrySet()) {
RangerPolicyConditionDef aCondition = mock(RangerPolicyConditionDef.class);
when(aCondition.getName()).thenReturn(anEntry.getKey());
when(aCondition.getEvaluator()).thenReturn(anEntry.getValue()[0]);
- Map<String, String> evaluatorOptions = new HashMap<String, String>();
+ Map<String, String> evaluatorOptions = new HashMap<>();
evaluatorOptions.put(anEntry.getValue()[1], anEntry.getValue()[1]);
when(aCondition.getEvaluatorOptions()).thenReturn(evaluatorOptions);
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/test/java/org/apache/ranger/plugin/resourcematcher/RangerDefaultResourceMatcherTest.java
----------------------------------------------------------------------
diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/resourcematcher/RangerDefaultResourceMatcherTest.java b/agents-common/src/test/java/org/apache/ranger/plugin/resourcematcher/RangerDefaultResourceMatcherTest.java
index 7532061..c635e0d 100644
--- a/agents-common/src/test/java/org/apache/ranger/plugin/resourcematcher/RangerDefaultResourceMatcherTest.java
+++ b/agents-common/src/test/java/org/apache/ranger/plugin/resourcematcher/RangerDefaultResourceMatcherTest.java
@@ -54,7 +54,7 @@ public class RangerDefaultResourceMatcherTest {
boolean result = (boolean)row[3];
String user = (String) row[4];
- Map<String, Object> evalContext = new HashMap<String, Object>();
+ Map<String, Object> evalContext = new HashMap<>();
RangerAccessRequestUtil.setCurrentUserInContext(evalContext, user);
MatcherWrapper matcher = new MatcherWrapper(policyValue, excludes);
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/test/java/org/apache/ranger/plugin/resourcematcher/RangerPathResourceMatcherTest.java
----------------------------------------------------------------------
diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/resourcematcher/RangerPathResourceMatcherTest.java b/agents-common/src/test/java/org/apache/ranger/plugin/resourcematcher/RangerPathResourceMatcherTest.java
index da81d81..5c49777 100644
--- a/agents-common/src/test/java/org/apache/ranger/plugin/resourcematcher/RangerPathResourceMatcherTest.java
+++ b/agents-common/src/test/java/org/apache/ranger/plugin/resourcematcher/RangerPathResourceMatcherTest.java
@@ -60,7 +60,7 @@ public class RangerPathResourceMatcherTest {
boolean result = (boolean)row[4];
String user = (String) row[5];
- Map<String, Object> evalContext = new HashMap<String, Object>();
+ Map<String, Object> evalContext = new HashMap<>();
RangerAccessRequestUtil.setCurrentUserInContext(evalContext, user);
MatcherWrapper matcher = new MatcherWrapper(policyValue, optWildcard, isRecursive);
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/test/java/org/apache/ranger/plugin/resourcematcher/TestDefaultPolicyResourceMatcher.java
----------------------------------------------------------------------
diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/resourcematcher/TestDefaultPolicyResourceMatcher.java b/agents-common/src/test/java/org/apache/ranger/plugin/resourcematcher/TestDefaultPolicyResourceMatcher.java
index 74cb45d..7d2519c 100644
--- a/agents-common/src/test/java/org/apache/ranger/plugin/resourcematcher/TestDefaultPolicyResourceMatcher.java
+++ b/agents-common/src/test/java/org/apache/ranger/plugin/resourcematcher/TestDefaultPolicyResourceMatcher.java
@@ -48,7 +48,7 @@ import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
public class TestDefaultPolicyResourceMatcher {
- static Gson gsonBuilder = null;
+ static Gson gsonBuilder;
@BeforeClass
public static void setUpBeforeClass() throws Exception {
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/test/java/org/apache/ranger/plugin/resourcematcher/TestResourceMatcher.java
----------------------------------------------------------------------
diff --git a/agents-common/src/test/java/org/apache/ranger/plugin/resourcematcher/TestResourceMatcher.java b/agents-common/src/test/java/org/apache/ranger/plugin/resourcematcher/TestResourceMatcher.java
index 39bd056..ea7bc01 100644
--- a/agents-common/src/test/java/org/apache/ranger/plugin/resourcematcher/TestResourceMatcher.java
+++ b/agents-common/src/test/java/org/apache/ranger/plugin/resourcematcher/TestResourceMatcher.java
@@ -40,7 +40,7 @@ import com.google.gson.Gson;
import com.google.gson.GsonBuilder;
public class TestResourceMatcher {
- static Gson gsonBuilder = null;
+ static Gson gsonBuilder;
@BeforeClass
public static void setUpBeforeClass() throws Exception {
[3/3] ranger git commit: RANGER-1371 : Remove unneded field
initializers, and unnecessary generic type informations
Posted by co...@apache.org.
RANGER-1371 : Remove unneded field initializers, and unnecessary generic type informations
Change-Id: I3e7c61eb1bd1e7f86164cef88e35d42b7637ff4e
Signed-off-by: Colm O hEigeartaigh <co...@apache.org>
Project: http://git-wip-us.apache.org/repos/asf/ranger/repo
Commit: http://git-wip-us.apache.org/repos/asf/ranger/commit/691c01f5
Tree: http://git-wip-us.apache.org/repos/asf/ranger/tree/691c01f5
Diff: http://git-wip-us.apache.org/repos/asf/ranger/diff/691c01f5
Branch: refs/heads/master
Commit: 691c01f53aacd2ae7da0d51d2c983be739620e96
Parents: 5250984
Author: Zsombor Gegesy <gz...@gmail.com>
Authored: Thu Feb 9 12:22:14 2017 +0100
Committer: Colm O hEigeartaigh <co...@apache.org>
Committed: Fri Feb 10 14:15:35 2017 +0000
----------------------------------------------------------------------
.../security/KrbPasswordSaverLoginModule.java | 3 +-
.../hadoop/security/SecureClientLogin.java | 5 +-
.../admin/client/RangerAdminRESTClient.java | 6 +-
.../admin/client/datatype/GrantRevokeData.java | 10 +-
.../hadoop/config/RangerConfiguration.java | 3 +-
.../config/RangerLegacyConfigBuilder.java | 8 +-
.../plugin/audit/RangerDefaultAuditHandler.java | 8 +-
.../audit/RangerMultiResourceAuditHandler.java | 3 +-
.../apache/ranger/plugin/client/BaseClient.java | 2 +-
.../plugin/client/HadoopConfigHolder.java | 13 +-
.../ranger/plugin/client/HadoopException.java | 9 +-
.../RangerAbstractConditionEvaluator.java | 8 +-
...rHiveResourcesAccessedTogetherCondition.java | 2 +-
...veResourcesNotAccessedTogetherCondition.java | 2 +-
.../conditionevaluator/RangerIpMatcher.java | 8 +-
.../RangerScriptExecutionContext.java | 2 +-
.../RangerScriptTemplateConditionEvaluator.java | 5 +-
.../RangerTimeOfDayMatcher.java | 5 +-
.../RangerAbstractGeolocationProvider.java | 2 +-
.../contextenricher/RangerTagEnricher.java | 26 +--
.../ranger/plugin/geo/BinarySearchTree.java | 2 +-
.../plugin/geo/RangerGeolocationData.java | 2 +-
.../plugin/geo/RangerGeolocationDatabase.java | 2 +-
.../plugin/model/RangerBaseModelObject.java | 19 +-
.../ranger/plugin/model/RangerPluginInfo.java | 6 +-
.../ranger/plugin/model/RangerPolicy.java | 91 ++++----
.../model/RangerPolicyResourceSignature.java | 2 +-
.../ranger/plugin/model/RangerService.java | 21 +-
.../ranger/plugin/model/RangerServiceDef.java | 216 +++++++++----------
.../plugin/model/RangerServiceResource.java | 7 +-
.../ranger/plugin/model/RangerTagDef.java | 8 +-
.../model/validation/RangerPolicyValidator.java | 4 +-
.../validation/RangerServiceDefHelper.java | 14 +-
.../validation/RangerServiceDefValidator.java | 20 +-
.../validation/RangerServiceValidator.java | 2 +-
.../model/validation/RangerValidator.java | 24 +--
.../policyengine/RangerAccessRequestImpl.java | 32 +--
.../policyengine/RangerAccessResourceImpl.java | 16 +-
.../RangerAccessResourceReadOnly.java | 4 +-
.../plugin/policyengine/RangerAccessResult.java | 14 +-
.../policyengine/RangerDataMaskResult.java | 8 +-
.../policyengine/RangerPolicyEngineCache.java | 2 +-
.../policyengine/RangerPolicyEngineImpl.java | 17 +-
.../policyengine/RangerPolicyEngineOptions.java | 10 +-
.../policyengine/RangerPolicyRepository.java | 22 +-
.../policyengine/RangerResourceAccessInfo.java | 8 +-
.../policyengine/RangerRowFilterResult.java | 4 +-
.../RangerAbstractPolicyEvaluator.java | 10 +-
.../RangerDefaultPolicyEvaluator.java | 38 ++--
.../RangerDefaultPolicyItemEvaluator.java | 8 +-
.../RangerOptimizedPolicyEvaluator.java | 18 +-
.../RangerResourceAccessCacheImpl.java | 4 +-
.../RangerDefaultPolicyResourceMatcher.java | 16 +-
.../RangerAbstractResourceMatcher.java | 20 +-
.../RangerPathResourceMatcher.java | 8 +-
.../ranger/plugin/service/RangerBasePlugin.java | 20 +-
.../plugin/store/AbstractPredicateUtil.java | 4 +-
.../plugin/store/AbstractServiceStore.java | 8 +-
.../plugin/store/EmbeddedServiceDefsUtil.java | 39 ++--
.../store/RangerServiceResourceSignature.java | 4 +-
.../plugin/store/ServicePredicateUtil.java | 2 +-
.../ranger/plugin/store/file/FileStoreUtil.java | 6 +-
.../plugin/store/file/GeolocationFileStore.java | 4 +-
.../ranger/plugin/util/GrantRevokeRequest.java | 19 +-
.../ranger/plugin/util/KeySearchFilter.java | 10 +-
.../ranger/plugin/util/PerfDataRecorder.java | 7 +-
.../ranger/plugin/util/PolicyRefresher.java | 5 +-
.../plugin/util/RangerAccessRequestUtil.java | 4 +-
.../ranger/plugin/util/RangerPerfTracer.java | 2 +-
.../ranger/plugin/util/RangerRESTClient.java | 34 +--
.../plugin/util/RangerRequestedResources.java | 2 +-
.../ranger/plugin/util/RangerResourceTrie.java | 32 +--
.../ranger/plugin/util/RangerSslHelper.java | 16 +-
.../apache/ranger/plugin/util/SearchFilter.java | 10 +-
.../ranger/services/tag/RangerServiceTag.java | 7 +-
.../conditionevaluator/RangerSimpleMatcher.java | 6 +-
.../plugin/contextenricher/TestTagEnricher.java | 7 +-
.../plugin/errors/TestValidationErrorCode.java | 2 +-
.../ranger/plugin/model/TestRangerPolicy.java | 2 +-
.../TestRangerPolicyResourceSignature.java | 2 +-
.../validation/TestRangerPolicyValidator.java | 16 +-
.../validation/TestRangerServiceDefHelper.java | 4 +-
.../TestRangerServiceDefValidator.java | 8 +-
.../validation/TestRangerServiceValidator.java | 2 +-
.../model/validation/TestRangerValidator.java | 22 +-
.../model/validation/ValidationTestUtils.java | 29 ++-
.../plugin/policyengine/TestCacheMap.java | 3 +-
.../plugin/policyengine/TestPolicyDb.java | 5 +-
.../plugin/policyengine/TestPolicyEngine.java | 3 +-
.../RangerDefaultPolicyEvaluatorTest.java | 4 +-
.../RangerDefaultResourceMatcherTest.java | 2 +-
.../RangerPathResourceMatcherTest.java | 2 +-
.../TestDefaultPolicyResourceMatcher.java | 2 +-
.../resourcematcher/TestResourceMatcher.java | 2 +-
94 files changed, 560 insertions(+), 627 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/main/java/org/apache/hadoop/security/KrbPasswordSaverLoginModule.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/hadoop/security/KrbPasswordSaverLoginModule.java b/agents-common/src/main/java/org/apache/hadoop/security/KrbPasswordSaverLoginModule.java
index aa986fd..521d2b9 100644
--- a/agents-common/src/main/java/org/apache/hadoop/security/KrbPasswordSaverLoginModule.java
+++ b/agents-common/src/main/java/org/apache/hadoop/security/KrbPasswordSaverLoginModule.java
@@ -27,12 +27,11 @@ import javax.security.auth.login.LoginException;
import javax.security.auth.spi.LoginModule;
public class KrbPasswordSaverLoginModule implements LoginModule {
-
public static final String USERNAME_PARAM = "javax.security.auth.login.name";
public static final String PASSWORD_PARAM = "javax.security.auth.login.password";
@SuppressWarnings("rawtypes")
- private Map sharedState = null;
+ private Map sharedState;
public KrbPasswordSaverLoginModule() {
}
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/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 e6b3387..e8516cd 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
@@ -161,9 +161,8 @@ public class SecureClientLogin {
}
class SecureClientLoginConfiguration extends javax.security.auth.login.Configuration {
-
- private Map<String, String> kerberosOptions = new HashMap<String, String>();
- private boolean usePassword = false;
+ private Map<String, String> kerberosOptions = new HashMap<>();
+ private boolean usePassword;
public SecureClientLoginConfiguration(boolean useKeyTab, String principal, String credential) {
kerberosOptions.put("principal", principal);
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/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 bcb07d7..4966a78 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
@@ -47,9 +47,9 @@ import java.util.List;
public class RangerAdminRESTClient implements RangerAdminClient {
private static final Log LOG = LogFactory.getLog(RangerAdminRESTClient.class);
- private String serviceName = null;
- private String pluginId = null;
- private RangerRESTClient restClient = null;
+ private String serviceName;
+ private String pluginId;
+ private RangerRESTClient restClient;
private RangerRESTUtils restUtils = new RangerRESTUtils();
public RangerAdminRESTClient() {
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/main/java/org/apache/ranger/admin/client/datatype/GrantRevokeData.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/admin/client/datatype/GrantRevokeData.java b/agents-common/src/main/java/org/apache/ranger/admin/client/datatype/GrantRevokeData.java
index 855758a..a8d3c6a 100644
--- a/agents-common/src/main/java/org/apache/ranger/admin/client/datatype/GrantRevokeData.java
+++ b/agents-common/src/main/java/org/apache/ranger/admin/client/datatype/GrantRevokeData.java
@@ -47,11 +47,10 @@ public class GrantRevokeData implements java.io.Serializable {
private String tables;
private String columns;
private String columnFamilies;
- private List<PermMap> permMapList = new ArrayList<PermMap>();
+ private List<PermMap> permMapList = new ArrayList<>();
private static String WILDCARD_ASTERISK = "*";
-
public GrantRevokeData() {
}
@@ -171,14 +170,13 @@ public class GrantRevokeData implements java.io.Serializable {
return toJson();
}
-
@JsonAutoDetect(getterVisibility = Visibility.NONE, setterVisibility = Visibility.NONE, fieldVisibility = Visibility.ANY)
@JsonSerialize(include = JsonSerialize.Inclusion.NON_NULL)
@JsonIgnoreProperties(ignoreUnknown = true)
public static class PermMap {
- private List<String> userList = new ArrayList<String>();
- private List<String> groupList = new ArrayList<String>();
- private List<String> permList = new ArrayList<String>();
+ private List<String> userList = new ArrayList<>();
+ private List<String> groupList = new ArrayList<>();
+ private List<String> permList = new ArrayList<>();
public PermMap() {
}
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerConfiguration.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerConfiguration.java b/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerConfiguration.java
index e487c85..d81f6b9 100644
--- a/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerConfiguration.java
+++ b/agents-common/src/main/java/org/apache/ranger/authorization/hadoop/config/RangerConfiguration.java
@@ -30,10 +30,9 @@ import org.apache.log4j.Logger;
import org.apache.ranger.audit.provider.AuditProviderFactory;
public class RangerConfiguration extends Configuration {
-
private static final Logger LOG = Logger.getLogger(RangerConfiguration.class);
- private static volatile RangerConfiguration config = null;
+ private static volatile RangerConfiguration config;
private RangerConfiguration() {
super(false);
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/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 066c995..2d1a56c 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
@@ -32,9 +32,8 @@ public class RangerLegacyConfigBuilder {
private static final Logger LOG = Logger.getLogger(RangerLegacyConfigBuilder.class);
- static String serviceType = null;
- static String legacyResource = null;
-
+ static String serviceType;
+ static String legacyResource;
public static Configuration getSecurityConfig(String serviceType) {
@@ -153,10 +152,9 @@ public class RangerLegacyConfigBuilder {
return rangerConf;
}
-
public static HashMap<String, String> getConfigChangeMap(String serviceType) {
// ConfigMap for moving legacy Configuration to Ranger Configuration
- HashMap<String, String> changeMap = new HashMap<String,String>();
+ HashMap<String, String> changeMap = new HashMap<>();
changeMap.put(serviceType,
getPropertyName(RangerConfigConstants.RANGER_SERVICE_NAME,serviceType));
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/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 1cb2295..b7a6f6e 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
@@ -41,10 +41,10 @@ public class RangerDefaultAuditHandler implements RangerAccessResultProcessor {
protected static final String RangerModuleName = RangerConfiguration.getInstance().get(RangerHadoopConstants.AUDITLOG_RANGER_MODULE_ACL_NAME_PROP , RangerHadoopConstants.DEFAULT_RANGER_MODULE_ACL_NAME);
private static final Log LOG = LogFactory.getLog(RangerDefaultAuditHandler.class);
- static long sequenceNumber = 0;
+ static long sequenceNumber;
private static String UUID = MiscUtil.generateUniqueId();
- private static AtomicInteger counter = new AtomicInteger(0);;
+ private static AtomicInteger counter = new AtomicInteger(0);
public RangerDefaultAuditHandler() {
}
@@ -146,7 +146,7 @@ public class RangerDefaultAuditHandler implements RangerAccessResultProcessor {
}
if(ret == null) {
- ret = new ArrayList<AuthzAuditEvent>();
+ ret = new ArrayList<>();
}
ret.add(event);
@@ -222,7 +222,7 @@ public class RangerDefaultAuditHandler implements RangerAccessResultProcessor {
Set<RangerTagForEval> tags = RangerAccessRequestUtil.getRequestTagsFromContext(request.getContext());
if (CollectionUtils.isNotEmpty(tags)) {
- ret = new HashSet<String>();
+ ret = new HashSet<>();
for (RangerTagForEval tag : tags) {
ret.add(tag.getType());
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/main/java/org/apache/ranger/plugin/audit/RangerMultiResourceAuditHandler.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/audit/RangerMultiResourceAuditHandler.java b/agents-common/src/main/java/org/apache/ranger/plugin/audit/RangerMultiResourceAuditHandler.java
index 839618e..9990dd4 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/audit/RangerMultiResourceAuditHandler.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/audit/RangerMultiResourceAuditHandler.java
@@ -29,8 +29,7 @@ import org.apache.ranger.audit.model.AuthzAuditEvent;
* request
*/
public class RangerMultiResourceAuditHandler extends RangerDefaultAuditHandler {
-
- Collection<AuthzAuditEvent> auditEvents = new ArrayList<AuthzAuditEvent>();
+ Collection<AuthzAuditEvent> auditEvents = new ArrayList<>();
public RangerMultiResourceAuditHandler() {
}
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/main/java/org/apache/ranger/plugin/client/BaseClient.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/client/BaseClient.java b/agents-common/src/main/java/org/apache/ranger/plugin/client/BaseClient.java
index aa90a92..2a570cb 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/client/BaseClient.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/client/BaseClient.java
@@ -172,7 +172,7 @@ public abstract class BaseClient {
}
public static String getMessage(Throwable excp) {
- List<String> errList = new ArrayList<String>();
+ List<String> errList = new ArrayList<>();
while (excp != null) {
if (!errList.contains(excp.getMessage() + ". \n")) {
if (excp.getMessage() != null && !(excp.getMessage().equalsIgnoreCase(""))) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/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 00374de..bd7d770 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
@@ -53,12 +53,11 @@ public class HadoopConfigHolder {
public static final String HADOOP_SECURITY_AUTHENTICATION_METHOD = "kerberos";
public static final String HADOOP_RPC_PROTECTION = "hadoop.rpc.protection";
-
- private static boolean initialized = false;
- private static Map<String,HashMap<String,Properties>> dataSource2ResourceListMap = new HashMap<String,HashMap<String,Properties>>();
+ private static boolean initialized;
+ private static Map<String,HashMap<String,Properties>> dataSource2ResourceListMap = new HashMap<>();
private static Properties globalLoginProp = new Properties();
- private static Map<String,HadoopConfigHolder> dataSource2HadoopConfigHolder = new HashMap<String,HadoopConfigHolder>();
- private static Properties resourcemapProperties = null;
+ private static Map<String,HadoopConfigHolder> dataSource2HadoopConfigHolder = new HashMap<>();
+ private static Properties resourcemapProperties;
private String datasourceName;
@@ -74,7 +73,7 @@ public class HadoopConfigHolder {
private Map<String,String> connectionProperties;
- private static Set<String> rangerInternalPropertyKeys = new HashSet<String>();
+ private static Set<String> rangerInternalPropertyKeys = new HashSet<>();
public static HadoopConfigHolder getInstance(String aDatasourceName) {
HadoopConfigHolder ret = dataSource2HadoopConfigHolder.get(aDatasourceName);
@@ -334,7 +333,7 @@ public class HadoopConfigHolder {
HashMap<String,Properties> resourceName2PropertiesMap = dataSource2ResourceListMap.get(dataSource);
if (resourceName2PropertiesMap == null) {
- resourceName2PropertiesMap = new HashMap<String,Properties>();
+ resourceName2PropertiesMap = new HashMap<>();
dataSource2ResourceListMap.put(dataSource, resourceName2PropertiesMap);
}
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/main/java/org/apache/ranger/plugin/client/HadoopException.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/client/HadoopException.java b/agents-common/src/main/java/org/apache/ranger/plugin/client/HadoopException.java
index 67e6cdf..5c2660f 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/client/HadoopException.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/client/HadoopException.java
@@ -26,34 +26,29 @@ import java.util.List;
import org.apache.commons.lang.StringUtils;
public class HadoopException extends RuntimeException {
-
private static final long serialVersionUID = 8872734935128535649L;
public HashMap<String, Object> responseData;
public HadoopException() {
super();
- // TODO Auto-generated constructor stub
}
public HadoopException(String message, Throwable cause) {
super(message, cause);
- // TODO Auto-generated constructor stub
}
public HadoopException(String message) {
super(message);
- // TODO Auto-generated constructor stub
}
public HadoopException(Throwable cause) {
super(cause);
- // TODO Auto-generated constructor stub
}
public void generateResponseDataMap(boolean connectivityStatus,
String message, String description, Long objectId, String fieldName) {
- responseData = new HashMap<String, Object>();
+ responseData = new HashMap<>();
responseData.put("connectivityStatus", connectivityStatus);
responseData.put("message", message);
responseData.put("description", description);
@@ -62,7 +57,7 @@ public class HadoopException extends RuntimeException {
}
public String getMessage(Throwable excp) {
- List<String> errList = new ArrayList<String>();
+ List<String> errList = new ArrayList<>();
while (excp != null) {
if (!errList.contains(excp.getMessage() + ". \n")) {
if (excp.getMessage() != null && !(excp.getMessage().equalsIgnoreCase(""))) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerAbstractConditionEvaluator.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerAbstractConditionEvaluator.java b/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerAbstractConditionEvaluator.java
index fd91c41..ddd1a54 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerAbstractConditionEvaluator.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerAbstractConditionEvaluator.java
@@ -16,18 +16,16 @@
* specific language governing permissions and limitations
* under the License.
*/
-
package org.apache.ranger.plugin.conditionevaluator;
import org.apache.ranger.plugin.model.RangerPolicy.RangerPolicyItemCondition;
import org.apache.ranger.plugin.model.RangerServiceDef;
import org.apache.ranger.plugin.model.RangerServiceDef.RangerPolicyConditionDef;
-
public abstract class RangerAbstractConditionEvaluator implements RangerConditionEvaluator {
- protected RangerServiceDef serviceDef = null;
- protected RangerPolicyConditionDef conditionDef = null;
- protected RangerPolicyItemCondition condition = null;
+ protected RangerServiceDef serviceDef;
+ protected RangerPolicyConditionDef conditionDef;
+ protected RangerPolicyItemCondition condition;
@Override
public void setServiceDef(RangerServiceDef serviceDef) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/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 b18e7cd..598cd0c 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
@@ -40,7 +40,7 @@ public class RangerHiveResourcesAccessedTogetherCondition extends RangerAbstract
private static final Log LOG = LogFactory.getLog(RangerHiveResourcesAccessedTogetherCondition.class);
private List<RangerPolicyResourceMatcher> matchers = new ArrayList<>();
- private boolean isInitialized = false;
+ private boolean isInitialized;
@Override
public void init() {
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/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 5036a06..a166fe1 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
@@ -40,7 +40,7 @@ public class RangerHiveResourcesNotAccessedTogetherCondition extends RangerAbstr
private static final Log LOG = LogFactory.getLog(RangerHiveResourcesNotAccessedTogetherCondition.class);
private List<RangerPolicyResourceMatcher> matchers = new ArrayList<>();
- private boolean isInitialized = false;
+ private boolean isInitialized;
@Override
public void init() {
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerIpMatcher.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerIpMatcher.java b/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerIpMatcher.java
index b6dbb7e..03d09a4 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerIpMatcher.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerIpMatcher.java
@@ -34,14 +34,12 @@ import org.apache.ranger.plugin.policyengine.RangerAccessRequest;
/**
* Credits: Large parts of this file have been lifted as is from org.apache.ranger.pdp.knox.URLBasedAuthDB. Credits for those are due to Dilli Arumugam.
* @author alal
- *
*/
public class RangerIpMatcher extends RangerAbstractConditionEvaluator {
-
private static final Log LOG = LogFactory.getLog(RangerIpMatcher.class);
- private List<String> _exactIps = new ArrayList<String>();
- private List<String> _wildCardIps = new ArrayList<String>();
- private boolean _allowAny = false;
+ private List<String> _exactIps = new ArrayList<>();
+ private List<String> _wildCardIps = new ArrayList<>();
+ private boolean _allowAny;
@Override
public void init() {
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/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 f91e01e..b8ee2f3 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
@@ -123,7 +123,7 @@ public final class RangerScriptExecutionContext {
for (RangerTagForEval tag : tagObjectList) {
String tagType = tag.getType();
if (allTagTypes == null) {
- allTagTypes = new HashSet<String>();
+ allTagTypes = new HashSet<>();
}
allTagTypes.add(tagType);
}
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerScriptTemplateConditionEvaluator.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerScriptTemplateConditionEvaluator.java b/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerScriptTemplateConditionEvaluator.java
index 939107e..e885920 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerScriptTemplateConditionEvaluator.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/conditionevaluator/RangerScriptTemplateConditionEvaluator.java
@@ -26,12 +26,11 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.ranger.plugin.policyengine.RangerAccessRequest;
-
public class RangerScriptTemplateConditionEvaluator extends RangerScriptConditionEvaluator {
private static final Log LOG = LogFactory.getLog(RangerScriptTemplateConditionEvaluator.class);
- protected String script = null;
- private boolean reverseResult = false;
+ protected String script;
+ private boolean reverseResult;
@Override
public void init() {
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/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 e663c46..b561142 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
@@ -35,10 +35,9 @@ import org.apache.commons.logging.LogFactory;
import org.apache.ranger.plugin.policyengine.RangerAccessRequest;
public class RangerTimeOfDayMatcher extends RangerAbstractConditionEvaluator {
-
private static final Log LOG = LogFactory.getLog(RangerTimeOfDayMatcher.class);
- boolean _allowAny = false;
- List<int[]> _durations = new ArrayList<int[]>();
+ boolean _allowAny;
+ List<int[]> _durations = new ArrayList<>();
@Override
public void init() {
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/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 c571061..0f681f8 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
@@ -36,7 +36,7 @@ public abstract class RangerAbstractGeolocationProvider extends RangerAbstractCo
public static final String ENRICHER_OPTION_GEOLOCATION_META_PREFIX = "geolocation.meta.prefix";
public static final String KEY_CONTEXT_GEOLOCATION_PREFIX = "LOCATION_";
- private GeolocationStore store = null;
+ private GeolocationStore store;
private String geoMetaPrefix;
abstract public String getGeoSourceLoader();
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/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 06ccfcc..ec10524 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
@@ -62,9 +62,9 @@ public class RangerTagEnricher extends RangerAbstractContextEnricher {
public static final String TAG_RETRIEVER_CLASSNAME_OPTION = "tagRetrieverClassName";
public static final String TAG_DISABLE_TRIE_PREFILTER_OPTION = "disableTrieLookupPrefilter";
- private RangerTagRefresher tagRefresher = null;
- private RangerTagRetriever tagRetriever = null;
- private boolean disableTrieLookupPrefilter = false;
+ private RangerTagRefresher tagRefresher;
+ private RangerTagRetriever tagRetriever;
+ private boolean disableTrieLookupPrefilter;
private EnrichedServiceTags enrichedServiceTags;
private boolean disableCacheIfServiceNotFound = true;
@@ -149,18 +149,15 @@ public class RangerTagEnricher extends RangerAbstractContextEnricher {
}
public void setServiceTags(final ServiceTags serviceTags) {
-
if (serviceTags == null || CollectionUtils.isEmpty(serviceTags.getServiceResources())) {
LOG.info("ServiceTags is null or there are no tagged resources for service " + serviceName);
enrichedServiceTags = null;
} else {
-
- List<RangerServiceResourceMatcher> resourceMatchers = new ArrayList<RangerServiceResourceMatcher>();
+ List<RangerServiceResourceMatcher> resourceMatchers = new ArrayList<>();
List<RangerServiceResource> serviceResources = serviceTags.getServiceResources();
if (CollectionUtils.isNotEmpty(serviceResources)) {
-
for (RangerServiceResource serviceResource : serviceResources) {
RangerDefaultPolicyResourceMatcher matcher = new RangerDefaultPolicyResourceMatcher();
@@ -183,14 +180,14 @@ public class RangerTagEnricher extends RangerAbstractContextEnricher {
Map<String, RangerResourceTrie<RangerServiceResourceMatcher>> serviceResourceTrie = null;
if (!disableTrieLookupPrefilter) {
- serviceResourceTrie = new HashMap<String, RangerResourceTrie<RangerServiceResourceMatcher>>();
+ serviceResourceTrie = new HashMap<>();
for (RangerServiceDef.RangerResourceDef resourceDef : serviceDef.getResources()) {
serviceResourceTrie.put(resourceDef.getName(), new RangerResourceTrie<RangerServiceResourceMatcher>(resourceDef, resourceMatchers));
}
}
- Set<RangerTagForEval> tagsForEmptyResourceAndAnyAccess = new HashSet<RangerTagForEval>();
+ Set<RangerTagForEval> tagsForEmptyResourceAndAnyAccess = new HashSet<>();
for (Map.Entry<Long, RangerTag> entry : serviceTags.getTags().entrySet()) {
tagsForEmptyResourceAndAnyAccess.add(new RangerTagForEval(entry.getValue(), RangerPolicyResourceMatcher.MatchType.ANCESTOR));
}
@@ -253,7 +250,7 @@ public class RangerTagEnricher extends RangerAbstractContextEnricher {
}
if (isMatched) {
if (ret == null) {
- ret = new HashSet<RangerTagForEval>();
+ ret = new HashSet<>();
}
ret.addAll(getTagsForServiceResource(enrichedServiceTags.getServiceTags(), resourceMatcher.getServiceResource(), matchType));
}
@@ -348,9 +345,8 @@ public class RangerTagEnricher extends RangerAbstractContextEnricher {
return ret;
}
- static private Set<RangerTagForEval> getTagsForServiceResource(final ServiceTags serviceTags, final RangerServiceResource serviceResource, final RangerPolicyResourceMatcher.MatchType matchType) {
-
- Set<RangerTagForEval> ret = new HashSet<RangerTagForEval>();
+ private static Set<RangerTagForEval> getTagsForServiceResource(final ServiceTags serviceTags, final RangerServiceResource serviceResource, final RangerPolicyResourceMatcher.MatchType matchType) {
+ Set<RangerTagForEval> ret = new HashSet<>();
final Long resourceId = serviceResource.getId();
@@ -402,11 +398,11 @@ public class RangerTagEnricher extends RangerAbstractContextEnricher {
private final RangerTagRetriever tagRetriever;
private final RangerTagEnricher tagEnricher;
private long lastKnownVersion = -1L;
- private long lastActivationTimeInMillis = 0L;
+ private long lastActivationTimeInMillis;
private final long pollingIntervalMs;
private final String cacheFile;
- private boolean hasProvidedTagsToReceiver = false;
+ private boolean hasProvidedTagsToReceiver;
private Gson gson;
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/main/java/org/apache/ranger/plugin/geo/BinarySearchTree.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/geo/BinarySearchTree.java b/agents-common/src/main/java/org/apache/ranger/plugin/geo/BinarySearchTree.java
index 8bee24e..68e242e 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/geo/BinarySearchTree.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/geo/BinarySearchTree.java
@@ -21,7 +21,7 @@ package org.apache.ranger.plugin.geo;
public class BinarySearchTree<T extends Comparable<T> & RangeChecker<V>, V> {
private Node<T> root;
- private int size = 0;
+ private int size;
public BinarySearchTree() {
root = null;
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/main/java/org/apache/ranger/plugin/geo/RangerGeolocationData.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/geo/RangerGeolocationData.java b/agents-common/src/main/java/org/apache/ranger/plugin/geo/RangerGeolocationData.java
index 72e23c7..99d6027 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/geo/RangerGeolocationData.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/geo/RangerGeolocationData.java
@@ -35,7 +35,7 @@ public class RangerGeolocationData implements Comparable<RangerGeolocationData>,
private final long fromIPAddress;
private final long toIPAddress;
private final String[] locationData;
- private int hash = 0;
+ private int hash;
public static RangerGeolocationData create(String fields[], int index, boolean useDotFormat) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/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 49cd4e9..e4a7dcc 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
@@ -26,7 +26,7 @@ import org.apache.commons.logging.LogFactory;
public class RangerGeolocationDatabase {
private static final Log LOG = LogFactory.getLog(RangerGeolocationDatabase.class);
- private BinarySearchTree<RangerGeolocationData, Long> data = new BinarySearchTree<RangerGeolocationData, Long>();
+ private BinarySearchTree<RangerGeolocationData, Long> data = new BinarySearchTree<>();
private GeolocationMetadata metadata = new GeolocationMetadata();
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerBaseModelObject.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerBaseModelObject.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerBaseModelObject.java
index 1f6676b..0273f7e 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerBaseModelObject.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerBaseModelObject.java
@@ -38,18 +38,15 @@ import org.codehaus.jackson.map.annotate.JsonSerialize;
public class RangerBaseModelObject implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- private Long id = null;
- private String guid = null;
- private Boolean isEnabled = null;
- private String createdBy = null;
- private String updatedBy = null;
- private Date createTime = null;
- private Date updateTime = null;
- private Long version = null;
+ private Long id;
+ private String guid;
+ private Boolean isEnabled;
+ private String createdBy;
+ private String updatedBy;
+ private Date createTime;
+ private Date updateTime;
+ private Long version;
- /**
- *
- */
public RangerBaseModelObject() {
setIsEnabled(null);
}
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPluginInfo.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPluginInfo.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPluginInfo.java
index d859368..11c3a99 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPluginInfo.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPluginInfo.java
@@ -59,9 +59,9 @@ public class RangerPluginInfo implements Serializable {
public static final String RANGER_ADMIN_LAST_TAG_UPDATE_TIME = "lastTagUpdateTime";
public static final String RANGER_ADMIN_LATEST_TAG_VERSION = "latestTagVersion";
- private Long id = null;
- private Date createTime = null;
- private Date updateTime = null;
+ private Long id;
+ private Date createTime;
+ private Date updateTime;
private String serviceName;
private String hostName;
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/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 140a59d..40667ee 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
@@ -57,19 +57,19 @@ public class RangerPolicy extends RangerBaseModelObject implements java.io.Seria
// For future use
private static final long serialVersionUID = 1L;
- private String service = null;
- private String name = null;
- private Integer policyType = null;
- private String description = null;
- private String resourceSignature = null;
- private Boolean isAuditEnabled = null;
- private Map<String, RangerPolicyResource> resources = null;
- private List<RangerPolicyItem> policyItems = null;
- private List<RangerPolicyItem> denyPolicyItems = null;
- private List<RangerPolicyItem> allowExceptions = null;
- private List<RangerPolicyItem> denyExceptions = null;
- private List<RangerDataMaskPolicyItem> dataMaskPolicyItems = null;
- private List<RangerRowFilterPolicyItem> rowFilterPolicyItems = null;
+ private String service;
+ private String name;
+ private Integer policyType;
+ private String description;
+ private String resourceSignature;
+ private Boolean isAuditEnabled;
+ private Map<String, RangerPolicyResource> resources;
+ private List<RangerPolicyItem> policyItems;
+ private List<RangerPolicyItem> denyPolicyItems;
+ private List<RangerPolicyItem> allowExceptions;
+ private List<RangerPolicyItem> denyExceptions;
+ private List<RangerDataMaskPolicyItem> dataMaskPolicyItems;
+ private List<RangerRowFilterPolicyItem> rowFilterPolicyItems;
/**
@@ -223,7 +223,7 @@ public class RangerPolicy extends RangerBaseModelObject implements java.io.Seria
*/
public void setResources(Map<String, RangerPolicyResource> resources) {
if(this.resources == null) {
- this.resources = new HashMap<String, RangerPolicyResource>();
+ this.resources = new HashMap<>();
}
if(this.resources == resources) {
@@ -251,7 +251,7 @@ public class RangerPolicy extends RangerBaseModelObject implements java.io.Seria
*/
public void setPolicyItems(List<RangerPolicyItem> policyItems) {
if(this.policyItems == null) {
- this.policyItems = new ArrayList<RangerPolicyItem>();
+ this.policyItems = new ArrayList<>();
}
if(this.policyItems == policyItems) {
@@ -279,7 +279,7 @@ public class RangerPolicy extends RangerBaseModelObject implements java.io.Seria
*/
public void setDenyPolicyItems(List<RangerPolicyItem> denyPolicyItems) {
if(this.denyPolicyItems == null) {
- this.denyPolicyItems = new ArrayList<RangerPolicyItem>();
+ this.denyPolicyItems = new ArrayList<>();
}
if(this.denyPolicyItems == denyPolicyItems) {
@@ -307,7 +307,7 @@ public class RangerPolicy extends RangerBaseModelObject implements java.io.Seria
*/
public void setAllowExceptions(List<RangerPolicyItem> allowExceptions) {
if(this.allowExceptions == null) {
- this.allowExceptions = new ArrayList<RangerPolicyItem>();
+ this.allowExceptions = new ArrayList<>();
}
if(this.allowExceptions == allowExceptions) {
@@ -335,7 +335,7 @@ public class RangerPolicy extends RangerBaseModelObject implements java.io.Seria
*/
public void setDenyExceptions(List<RangerPolicyItem> denyExceptions) {
if(this.denyExceptions == null) {
- this.denyExceptions = new ArrayList<RangerPolicyItem>();
+ this.denyExceptions = new ArrayList<>();
}
if(this.denyExceptions == denyExceptions) {
@@ -357,7 +357,7 @@ public class RangerPolicy extends RangerBaseModelObject implements java.io.Seria
public void setDataMaskPolicyItems(List<RangerDataMaskPolicyItem> dataMaskPolicyItems) {
if(this.dataMaskPolicyItems == null) {
- this.dataMaskPolicyItems = new ArrayList<RangerDataMaskPolicyItem>();
+ this.dataMaskPolicyItems = new ArrayList<>();
}
if(this.dataMaskPolicyItems == dataMaskPolicyItems) {
@@ -379,7 +379,7 @@ public class RangerPolicy extends RangerBaseModelObject implements java.io.Seria
public void setRowFilterPolicyItems(List<RangerRowFilterPolicyItem> rowFilterPolicyItems) {
if(this.rowFilterPolicyItems == null) {
- this.rowFilterPolicyItems = new ArrayList<RangerRowFilterPolicyItem>();
+ this.rowFilterPolicyItems = new ArrayList<>();
}
if(this.rowFilterPolicyItems == rowFilterPolicyItems) {
@@ -500,10 +500,9 @@ public class RangerPolicy extends RangerBaseModelObject implements java.io.Seria
public static class RangerPolicyResource implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- private List<String> values = null;
- private Boolean isExcludes = null;
- private Boolean isRecursive = null;
-
+ private List<String> values;
+ private Boolean isExcludes;
+ private Boolean isRecursive;
public RangerPolicyResource() {
this((List<String>)null, null, null);
@@ -539,7 +538,7 @@ public class RangerPolicy extends RangerBaseModelObject implements java.io.Seria
*/
public void setValues(List<String> values) {
if(this.values == null) {
- this.values = new ArrayList<String>();
+ this.values = new ArrayList<>();
}
if(this.values == values) {
@@ -560,7 +559,7 @@ public class RangerPolicy extends RangerBaseModelObject implements java.io.Seria
*/
public void setValue(String value) {
if(this.values == null) {
- this.values = new ArrayList<String>();
+ this.values = new ArrayList<>();
}
this.values.clear();
@@ -671,11 +670,11 @@ public class RangerPolicy extends RangerBaseModelObject implements java.io.Seria
public static class RangerPolicyItem implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- private List<RangerPolicyItemAccess> accesses = null;
- private List<String> users = null;
- private List<String> groups = null;
- private List<RangerPolicyItemCondition> conditions = null;
- private Boolean delegateAdmin = null;
+ private List<RangerPolicyItemAccess> accesses;
+ private List<String> users;
+ private List<String> groups;
+ private List<RangerPolicyItemCondition> conditions;
+ private Boolean delegateAdmin;
public RangerPolicyItem() {
this(null, null, null, null, null);
@@ -700,7 +699,7 @@ public class RangerPolicy extends RangerBaseModelObject implements java.io.Seria
*/
public void setAccesses(List<RangerPolicyItemAccess> accesses) {
if(this.accesses == null) {
- this.accesses = new ArrayList<RangerPolicyItemAccess>();
+ this.accesses = new ArrayList<>();
}
if(this.accesses == accesses) {
@@ -726,7 +725,7 @@ public class RangerPolicy extends RangerBaseModelObject implements java.io.Seria
*/
public void setUsers(List<String> users) {
if(this.users == null) {
- this.users = new ArrayList<String>();
+ this.users = new ArrayList<>();
}
if(this.users == users) {
@@ -752,7 +751,7 @@ public class RangerPolicy extends RangerBaseModelObject implements java.io.Seria
*/
public void setGroups(List<String> groups) {
if(this.groups == null) {
- this.groups = new ArrayList<String>();
+ this.groups = new ArrayList<>();
}
if(this.groups == groups) {
@@ -778,7 +777,7 @@ public class RangerPolicy extends RangerBaseModelObject implements java.io.Seria
*/
public void setConditions(List<RangerPolicyItemCondition> conditions) {
if(this.conditions == null) {
- this.conditions = new ArrayList<RangerPolicyItemCondition>();
+ this.conditions = new ArrayList<>();
}
if(this.conditions == conditions) {
@@ -929,7 +928,7 @@ public class RangerPolicy extends RangerBaseModelObject implements java.io.Seria
public static class RangerDataMaskPolicyItem extends RangerPolicyItem implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- private RangerPolicyItemDataMaskInfo dataMaskInfo = null;
+ private RangerPolicyItemDataMaskInfo dataMaskInfo;
public RangerDataMaskPolicyItem() {
this(null, null, null, null, null, null);
@@ -1016,7 +1015,7 @@ public class RangerPolicy extends RangerBaseModelObject implements java.io.Seria
public static class RangerRowFilterPolicyItem extends RangerPolicyItem implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- private RangerPolicyItemRowFilterInfo rowFilterInfo = null;
+ private RangerPolicyItemRowFilterInfo rowFilterInfo;
public RangerRowFilterPolicyItem() {
this(null, null, null, null, null, null);
@@ -1103,8 +1102,8 @@ public class RangerPolicy extends RangerBaseModelObject implements java.io.Seria
public static class RangerPolicyItemAccess implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- private String type = null;
- private Boolean isAllowed = null;
+ private String type;
+ private Boolean isAllowed;
public RangerPolicyItemAccess() {
this(null, null);
@@ -1207,8 +1206,8 @@ public class RangerPolicy extends RangerBaseModelObject implements java.io.Seria
public static class RangerPolicyItemCondition implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- private String type = null;
- private List<String> values = null;
+ private String type;
+ private List<String> values;
public RangerPolicyItemCondition() {
this(null, null);
@@ -1245,7 +1244,7 @@ public class RangerPolicy extends RangerBaseModelObject implements java.io.Seria
*/
public void setValues(List<String> values) {
if (this.values == null) {
- this.values = new ArrayList<String>();
+ this.values = new ArrayList<>();
}
if(this.values == values) {
@@ -1327,9 +1326,9 @@ public class RangerPolicy extends RangerBaseModelObject implements java.io.Seria
public static class RangerPolicyItemDataMaskInfo implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- private String dataMaskType = null;
- private String conditionExpr = null;
- private String valueExpr = null;
+ private String dataMaskType;
+ private String conditionExpr;
+ private String valueExpr;
public RangerPolicyItemDataMaskInfo() { }
@@ -1432,7 +1431,7 @@ public class RangerPolicy extends RangerBaseModelObject implements java.io.Seria
public static class RangerPolicyItemRowFilterInfo implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- private String filterExpr = null;
+ private String filterExpr;
public RangerPolicyItemRowFilterInfo() { }
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicyResourceSignature.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicyResourceSignature.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicyResourceSignature.java
index c63b54d..27d0e42 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicyResourceSignature.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerPolicyResourceSignature.java
@@ -129,7 +129,7 @@ public class RangerPolicyResourceSignature {
if (_policy.getPolicyType() != null) {
type = _policy.getPolicyType();
}
- Map<String, ResourceSerializer> resources = new TreeMap<String, ResourceSerializer>();
+ Map<String, ResourceSerializer> resources = new TreeMap<>();
for (Map.Entry<String, RangerPolicyResource> entry : _policy.getResources().entrySet()) {
String resourceName = entry.getKey();
ResourceSerializer resourceView = new ResourceSerializer(entry.getValue());
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerService.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerService.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerService.java
index 0c1c0ee..ed8d384 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerService.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerService.java
@@ -41,16 +41,15 @@ import org.codehaus.jackson.map.annotate.JsonSerialize;
public class RangerService extends RangerBaseModelObject implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- private String type = null;
- private String name = null;
- private String description = null;
- private String tagService = null;
- private Map<String, String> configs = null;
- private Long policyVersion = null;
- private Date policyUpdateTime = null;
- private Long tagVersion = null;
- private Date tagUpdateTime = null;
-
+ private String type;
+ private String name;
+ private String description;
+ private String tagService;
+ private Map<String, String> configs;
+ private Long policyVersion;
+ private Date policyUpdateTime;
+ private Long tagVersion;
+ private Date tagUpdateTime;
/**
@@ -158,7 +157,7 @@ public class RangerService extends RangerBaseModelObject implements java.io.Seri
*/
public void setConfigs(Map<String, String> configs) {
if(this.configs == null) {
- this.configs = new HashMap<String, String>();
+ this.configs = new HashMap<>();
}
if(this.configs == configs) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/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 ee309bd..b3e0964 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
@@ -45,22 +45,21 @@ public class RangerServiceDef extends RangerBaseModelObject implements java.io.S
public static final String OPTION_ENABLE_DENY_AND_EXCEPTIONS_IN_POLICIES = "enableDenyAndExceptionsInPolicies";
- private String name = null;
- private String implClass = null;
- private String label = null;
- private String description = null;
- private String rbKeyLabel = null;
- private String rbKeyDescription = null;
- private Map<String, String> options = null;
- private List<RangerServiceConfigDef> configs = null;
- private List<RangerResourceDef> resources = null;
- private List<RangerAccessTypeDef> accessTypes = null;
- private List<RangerPolicyConditionDef> policyConditions = null;
- private List<RangerContextEnricherDef> contextEnrichers = null;
- private List<RangerEnumDef> enums = null;
- private RangerDataMaskDef dataMaskDef = null;
- private RangerRowFilterDef rowFilterDef = null;
-
+ private String name;
+ private String implClass;
+ private String label;
+ private String description;
+ private String rbKeyLabel;
+ private String rbKeyDescription;
+ private Map<String, String> options;
+ private List<RangerServiceConfigDef> configs;
+ private List<RangerResourceDef> resources;
+ private List<RangerAccessTypeDef> accessTypes;
+ private List<RangerPolicyConditionDef> policyConditions;
+ private List<RangerContextEnricherDef> contextEnrichers;
+ private List<RangerEnumDef> enums;
+ private RangerDataMaskDef dataMaskDef;
+ private RangerRowFilterDef rowFilterDef;
public RangerServiceDef() {
this(null, null, null, null, null, null, null, null, null, null, null, null, null);
@@ -217,7 +216,7 @@ public class RangerServiceDef extends RangerBaseModelObject implements java.io.S
*/
public void setConfigs(List<RangerServiceConfigDef> configs) {
if(this.configs == null) {
- this.configs = new ArrayList<RangerServiceConfigDef>();
+ this.configs = new ArrayList<>();
} else
if(this.configs == configs) {
@@ -245,7 +244,7 @@ public class RangerServiceDef extends RangerBaseModelObject implements java.io.S
*/
public void setOptions(Map<String, String> options) {
if(this.options == null) {
- this.options = new HashMap<String, String>();
+ this.options = new HashMap<>();
} else if(this.options == options) {
return;
}
@@ -271,7 +270,7 @@ public class RangerServiceDef extends RangerBaseModelObject implements java.io.S
*/
public void setResources(List<RangerResourceDef> resources) {
if(this.resources == null) {
- this.resources = new ArrayList<RangerResourceDef>();
+ this.resources = new ArrayList<>();
}
if(this.resources == resources) {
@@ -299,7 +298,7 @@ public class RangerServiceDef extends RangerBaseModelObject implements java.io.S
*/
public void setAccessTypes(List<RangerAccessTypeDef> accessTypes) {
if(this.accessTypes == null) {
- this.accessTypes = new ArrayList<RangerAccessTypeDef>();
+ this.accessTypes = new ArrayList<>();
}
if(this.accessTypes == accessTypes) {
@@ -327,7 +326,7 @@ public class RangerServiceDef extends RangerBaseModelObject implements java.io.S
*/
public void setPolicyConditions(List<RangerPolicyConditionDef> policyConditions) {
if(this.policyConditions == null) {
- this.policyConditions = new ArrayList<RangerPolicyConditionDef>();
+ this.policyConditions = new ArrayList<>();
}
if(this.policyConditions == policyConditions) {
@@ -355,7 +354,7 @@ public class RangerServiceDef extends RangerBaseModelObject implements java.io.S
*/
public void setContextEnrichers(List<RangerContextEnricherDef> contextEnrichers) {
if(this.contextEnrichers == null) {
- this.contextEnrichers = new ArrayList<RangerContextEnricherDef>();
+ this.contextEnrichers = new ArrayList<>();
}
if(this.contextEnrichers == contextEnrichers) {
@@ -383,7 +382,7 @@ public class RangerServiceDef extends RangerBaseModelObject implements java.io.S
*/
public void setEnums(List<RangerEnumDef> enums) {
if(this.enums == null) {
- this.enums = new ArrayList<RangerEnumDef>();
+ this.enums = new ArrayList<>();
}
if(this.enums == enums) {
@@ -530,11 +529,10 @@ public class RangerServiceDef extends RangerBaseModelObject implements java.io.S
public static class RangerEnumDef implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- private Long itemId = null;
- private String name = null;
- private List<RangerEnumElementDef> elements = null;
- private Integer defaultIndex = null;
-
+ private Long itemId;
+ private String name;
+ private List<RangerEnumElementDef> elements;
+ private Integer defaultIndex;
public RangerEnumDef() {
this(null, null, null, null);
@@ -587,7 +585,7 @@ public class RangerServiceDef extends RangerBaseModelObject implements java.io.S
*/
public void setElements(List<RangerEnumElementDef> elements) {
if(this.elements == null) {
- this.elements = new ArrayList<RangerEnumElementDef>();
+ this.elements = new ArrayList<>();
}
if(this.elements == elements) {
@@ -701,11 +699,10 @@ public class RangerServiceDef extends RangerBaseModelObject implements java.io.S
public static class RangerEnumElementDef implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- private Long itemId = null;
- private String name = null;
- private String label = null;
- private String rbKeyLabel = null;
-
+ private Long itemId;
+ private String name;
+ private String label;
+ private String rbKeyLabel;
public RangerEnumElementDef() {
this(null, null, null, null);
@@ -851,21 +848,20 @@ public class RangerServiceDef extends RangerBaseModelObject implements java.io.S
public static class RangerServiceConfigDef implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- private Long itemId = null;
- private String name = null;
- private String type = null;
- private String subType = null;
- private Boolean mandatory = null;
- private String defaultValue = null;
- private String validationRegEx = null;
- private String validationMessage = null;
- private String uiHint = null;
- private String label = null;
- private String description = null;
- private String rbKeyLabel = null;
- private String rbKeyDescription = null;
- private String rbKeyValidationMessage = null;
-
+ private Long itemId;
+ private String name;
+ private String type;
+ private String subType;
+ private Boolean mandatory;
+ private String defaultValue;
+ private String validationRegEx;
+ private String validationMessage;
+ private String uiHint;
+ private String label;
+ private String description;
+ private String rbKeyLabel;
+ private String rbKeyDescription;
+ private String rbKeyValidationMessage;
public RangerServiceConfigDef() {
this(null, null, null, null, null, null, null, null, null, null, null, null, null, null);
@@ -1240,25 +1236,25 @@ public class RangerServiceDef extends RangerBaseModelObject implements java.io.S
public static class RangerResourceDef implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- private Long itemId = null;
- private String name = null;
- private String type = null;
- private Integer level = null;
- private String parent = null;
- private Boolean mandatory = null;
- private Boolean lookupSupported = null;
- private Boolean recursiveSupported = null;
- private Boolean excludesSupported = null;
- private String matcher = null;
- private Map<String, String> matcherOptions = null;
- private String validationRegEx = null;
- private String validationMessage = null;
- private String uiHint = null;
- private String label = null;
- private String description = null;
- private String rbKeyLabel = null;
- private String rbKeyDescription = null;
- private String rbKeyValidationMessage = null;
+ private Long itemId;
+ private String name;
+ private String type;
+ private Integer level;
+ private String parent;
+ private Boolean mandatory;
+ private Boolean lookupSupported;
+ private Boolean recursiveSupported;
+ private Boolean excludesSupported;
+ private String matcher;
+ private Map<String, String> matcherOptions;
+ private String validationRegEx;
+ private String validationMessage;
+ private String uiHint;
+ private String label;
+ private String description;
+ private String rbKeyLabel;
+ private String rbKeyDescription;
+ private String rbKeyValidationMessage;
public RangerResourceDef() {
this(null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null, null);
@@ -1777,12 +1773,11 @@ public class RangerServiceDef extends RangerBaseModelObject implements java.io.S
public static class RangerAccessTypeDef implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- private Long itemId = null;
- private String name = null;
- private String label = null;
- private String rbKeyLabel = null;
- private Collection<String> impliedGrants = null;
-
+ private Long itemId;
+ private String name;
+ private String label;
+ private String rbKeyLabel;
+ private Collection<String> impliedGrants;
public RangerAccessTypeDef() {
this(null, null, null, null, null);
@@ -1797,11 +1792,11 @@ public class RangerServiceDef extends RangerBaseModelObject implements java.io.S
}
public RangerAccessTypeDef(RangerAccessTypeDef other) {
- this.setItemId(other.getItemId());
- this.setName(other.getName());
- this.setLabel(other.getLabel());
- this.setRbKeyLabel(other.getRbKeyLabel());
- this.setImpliedGrants(other.getImpliedGrants());
+ setItemId(other.getItemId());
+ setName(other.getName());
+ setLabel(other.getLabel());
+ setRbKeyLabel(other.getRbKeyLabel());
+ setImpliedGrants(other.getImpliedGrants());
}
/**
@@ -1872,7 +1867,7 @@ public class RangerServiceDef extends RangerBaseModelObject implements java.io.S
*/
public void setImpliedGrants(Collection<String> impliedGrants) {
if(this.impliedGrants == null) {
- this.impliedGrants = new ArrayList<String>();
+ this.impliedGrants = new ArrayList<>();
}
if(this.impliedGrants == impliedGrants) {
@@ -1982,19 +1977,18 @@ public class RangerServiceDef extends RangerBaseModelObject implements java.io.S
public static class RangerPolicyConditionDef implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- private Long itemId = null;
- private String name = null;
- private String evaluator = null;
- private Map<String, String> evaluatorOptions = null;
- private String validationRegEx = null;
- private String validationMessage = null;
- private String uiHint = null;
- private String label = null;
- private String description = null;
- private String rbKeyLabel = null;
- private String rbKeyDescription = null;
- private String rbKeyValidationMessage = null;
-
+ private Long itemId;
+ private String name;
+ private String evaluator;
+ private Map<String, String> evaluatorOptions;
+ private String validationRegEx;
+ private String validationMessage;
+ private String uiHint;
+ private String label;
+ private String description;
+ private String rbKeyLabel;
+ private String rbKeyDescription;
+ private String rbKeyValidationMessage;
public RangerPolicyConditionDef() {
this(null, null, null, null, null, null, null, null, null, null, null, null);
@@ -2338,11 +2332,10 @@ public class RangerServiceDef extends RangerBaseModelObject implements java.io.S
public static class RangerContextEnricherDef implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- private Long itemId = null;
- private String name = null;
- private String enricher = null;
- private Map<String, String> enricherOptions = null;
-
+ private Long itemId;
+ private String name;
+ private String enricher;
+ private Map<String, String> enricherOptions;
public RangerContextEnricherDef() {
this(null, null, null, null);
@@ -2519,7 +2512,7 @@ public class RangerServiceDef extends RangerBaseModelObject implements java.io.S
public void setMaskTypes(List<RangerDataMaskTypeDef> maskTypes) {
if(this.maskTypes == null) {
- this.maskTypes = new ArrayList<RangerDataMaskTypeDef>();
+ this.maskTypes = new ArrayList<>();
}
if(this.maskTypes == maskTypes) {
@@ -2541,7 +2534,7 @@ public class RangerServiceDef extends RangerBaseModelObject implements java.io.S
public void setAccessTypes(List<RangerAccessTypeDef> accessTypes) {
if(this.accessTypes == null) {
- this.accessTypes = new ArrayList<RangerAccessTypeDef>();
+ this.accessTypes = new ArrayList<>();
}
if(this.accessTypes == accessTypes) {
@@ -2563,7 +2556,7 @@ public class RangerServiceDef extends RangerBaseModelObject implements java.io.S
public void setResources(List<RangerResourceDef> resources) {
if(this.resources == null) {
- this.resources = new ArrayList<RangerResourceDef>();
+ this.resources = new ArrayList<>();
}
if(this.resources == resources) {
@@ -2673,15 +2666,14 @@ public class RangerServiceDef extends RangerBaseModelObject implements java.io.S
public static class RangerDataMaskTypeDef implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- private Long itemId = null;
- private String name = null;
- private String label = null;
- private String description = null;
- private String transformer = null;
- private Map<String, String> dataMaskOptions = null;
- private String rbKeyLabel = null;
- private String rbKeyDescription = null;
-
+ private Long itemId;
+ private String name;
+ private String label;
+ private String description;
+ private String transformer;
+ private Map<String, String> dataMaskOptions;
+ private String rbKeyLabel;
+ private String rbKeyDescription;
public RangerDataMaskTypeDef() {
this(null, null, null, null, null, null, null, null);
@@ -2931,7 +2923,7 @@ public class RangerServiceDef extends RangerBaseModelObject implements java.io.S
public void setAccessTypes(List<RangerAccessTypeDef> accessTypes) {
if(this.accessTypes == null) {
- this.accessTypes = new ArrayList<RangerAccessTypeDef>();
+ this.accessTypes = new ArrayList<>();
}
if(this.accessTypes == accessTypes) {
@@ -2953,7 +2945,7 @@ public class RangerServiceDef extends RangerBaseModelObject implements java.io.S
public void setResources(List<RangerResourceDef> resources) {
if(this.resources == null) {
- this.resources = new ArrayList<RangerResourceDef>();
+ this.resources = new ArrayList<>();
}
if(this.resources == resources) {
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerServiceResource.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerServiceResource.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerServiceResource.java
index d94867a..67230c6 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerServiceResource.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerServiceResource.java
@@ -37,10 +37,9 @@ import java.util.Map;
public class RangerServiceResource extends RangerBaseModelObject {
private static final long serialVersionUID = 1L;
- private String serviceName = null;
- private Map<String, RangerPolicy.RangerPolicyResource> resourceElements = null;
- private String resourceSignature = null;
-
+ private String serviceName;
+ private Map<String, RangerPolicy.RangerPolicyResource> resourceElements;
+ private String resourceSignature;
public RangerServiceResource(String guid, String serviceName, Map<String, RangerPolicy.RangerPolicyResource> resourceElements, String resourceSignature) {
super();
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerTagDef.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerTagDef.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerTagDef.java
index 9f2982f..c787bec 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerTagDef.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/RangerTagDef.java
@@ -43,8 +43,8 @@ import java.util.List;
public class RangerTagDef extends RangerBaseModelObject {
private static final long serialVersionUID = 1L;
- private String name = null;
- private String source = null;
+ private String name;
+ private String source;
private List<RangerTagAttributeDef> attributeDefs;
@@ -104,8 +104,8 @@ public class RangerTagDef extends RangerBaseModelObject {
public static class RangerTagAttributeDef implements java.io.Serializable {
private static final long serialVersionUID = 1L;
- private String name = null;
- private String type = null;
+ private String name;
+ private String type;
public RangerTagAttributeDef() {
this(null, null);
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/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 0c82b7e..b401c10 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
@@ -52,7 +52,7 @@ public class RangerPolicyValidator extends RangerValidator {
LOG.debug(String.format("==> RangerPolicyValidator.validate(%s, %s, %s)", policy, action, isAdmin));
}
- List<ValidationFailureDetails> failures = new ArrayList<ValidationFailureDetails>();
+ List<ValidationFailureDetails> failures = new ArrayList<>();
boolean valid = isValid(policy, action, isAdmin, failures);
String message = "";
try {
@@ -697,7 +697,7 @@ public class RangerPolicyValidator extends RangerValidator {
RangerPolicyResource policyResource = entry.getValue();
if(policyResource != null) {
if(CollectionUtils.isNotEmpty(policyResource.getValues())) {
- Set<String> resources = new HashSet<String>(policyResource.getValues());
+ Set<String> resources = new HashSet<>(policyResource.getValues());
for (String aValue : resources) {
if (StringUtils.isBlank(aValue)) {
policyResource.getValues().remove(aValue);
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/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 f952c57..89f36cd 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
@@ -41,10 +41,9 @@ import org.apache.ranger.plugin.model.RangerServiceDef.RangerResourceDef;
import com.google.common.collect.Lists;
public class RangerServiceDefHelper {
-
private static final Log LOG = LogFactory.getLog(RangerServiceDefHelper.class);
- static final Map<String, Delegate> _Cache = new ConcurrentHashMap<String, Delegate>();
+ static final Map<String, Delegate> _Cache = new ConcurrentHashMap<>();
final Delegate _delegate;
public RangerServiceDefHelper(RangerServiceDef serviceDef) {
@@ -147,8 +146,7 @@ public class RangerServiceDefHelper {
* Not designed for public access. Package level only for testability.
*/
static class Delegate {
-
- final Map<Integer, Set<List<RangerResourceDef>>> _hierarchies = new HashMap<Integer, Set<List<RangerResourceDef>>>();
+ final Map<Integer, Set<List<RangerResourceDef>>> _hierarchies = new HashMap<>();
final Date _serviceDefFreshnessDate;
final String _serviceName;
final boolean _valid;
@@ -289,7 +287,7 @@ public class RangerServiceDefHelper {
* @return
*/
Set<List<String>> getHierarchies(DirectedGraph graph) {
- Set<List<String>> hierarchies = new HashSet<List<String>>();
+ Set<List<String>> hierarchies = new HashSet<>();
Set<String> sources = graph.getSources();
Set<String> sinks = graph.getSinks();
for (String source : sources) {
@@ -345,7 +343,7 @@ public class RangerServiceDefHelper {
* Limited DAG implementation to analyze resource graph for a service. Not designed for public access. Package level only for testability.
*/
static class DirectedGraph {
- Map<String, Set<String>> _nodes = new HashMap<String, Set<String>>();
+ Map<String, Set<String>> _nodes = new HashMap<>();
/**
* Add a node to the graph
@@ -406,7 +404,7 @@ public class RangerServiceDefHelper {
* @return
*/
Set<String> getSources() {
- Set<String> sources = new HashSet<String>(_nodes.keySet());
+ Set<String> sources = new HashSet<>(_nodes.keySet());
for (Map.Entry<String, Set<String>> entry : _nodes.entrySet()) {
Set<String> nbrs = entry.getValue(); // can never be null
sources.removeAll(nbrs); // A source in a DAG can't be a neighbor of any other node
@@ -423,7 +421,7 @@ public class RangerServiceDefHelper {
* @return
*/
Set<String> getSinks() {
- Set<String> sinks = new HashSet<String>();
+ Set<String> sinks = new HashSet<>();
for (Map.Entry<String, Set<String>> entry : _nodes.entrySet()) {
Set<String> nbrs = entry.getValue();
if (nbrs.isEmpty()) { // A sink in a DAG doesn't have any neighbor
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceDefValidator.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceDefValidator.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceDefValidator.java
index 79ac674..3f2cc2a 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceDefValidator.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceDefValidator.java
@@ -58,7 +58,7 @@ public class RangerServiceDefValidator extends RangerValidator {
LOG.debug(String.format("==> RangerServiceDefValidator.validate(%s, %s)", serviceDef, action));
}
- List<ValidationFailureDetails> failures = new ArrayList<ValidationFailureDetails>();
+ List<ValidationFailureDetails> failures = new ArrayList<>();
boolean valid = isValid(serviceDef, action, failures);
String message = "";
try {
@@ -247,9 +247,9 @@ public class RangerServiceDefValidator extends RangerValidator {
.build());
valid = false;
} else {
- List<RangerAccessTypeDef> defsWithImpliedGrants = new ArrayList<RangerAccessTypeDef>();
- Set<String> accessNames = new HashSet<String>();
- Set<Long> ids = new HashSet<Long>();
+ List<RangerAccessTypeDef> defsWithImpliedGrants = new ArrayList<>();
+ Set<String> accessNames = new HashSet<>();
+ Set<Long> ids = new HashSet<>();
for (RangerAccessTypeDef def : accessTypeDefs) {
String name = def.getName();
valid = isUnique(name, accessNames, "access type name", "access types", failures) && valid;
@@ -304,8 +304,8 @@ public class RangerServiceDefValidator extends RangerValidator {
if (CollectionUtils.isEmpty(policyConditions)) {
LOG.debug("Configs collection was null/empty! ok");
} else {
- Set<Long> ids = new HashSet<Long>();
- Set<String> names = new HashSet<String>();
+ Set<Long> ids = new HashSet<>();
+ Set<String> names = new HashSet<>();
for (RangerPolicyConditionDef conditionDef : policyConditions) {
valid = isUnique(conditionDef.getItemId(), ids, "policy condition def itemId", "policy condition defs", failures) && valid;
String name = conditionDef.getName();
@@ -522,8 +522,8 @@ public class RangerServiceDefValidator extends RangerValidator {
if (CollectionUtils.isEmpty(enumDefs)) {
LOG.debug("enum def collection passed in was null/empty. Ok.");
} else {
- Set<String> names = new HashSet<String>();
- Set<Long> ids = new HashSet<Long>();
+ Set<String> names = new HashSet<>();
+ Set<Long> ids = new HashSet<>();
for (RangerEnumDef enumDef : enumDefs) {
if (enumDef == null) {
ValidationErrorCode error = ValidationErrorCode.SERVICE_DEF_VALIDATION_ERR_ENUM_DEF_NULL_OBJECT;
@@ -586,8 +586,8 @@ public class RangerServiceDefValidator extends RangerValidator {
LOG.debug("Enum elements list passed in was null/empty!");
} else {
// enum element names should be valid and distinct
- Set<String> elementNames = new HashSet<String>();
- Set<Long> ids = new HashSet<Long>();
+ Set<String> elementNames = new HashSet<>();
+ Set<Long> ids = new HashSet<>();
for (RangerEnumElementDef elementDef : enumElementsDefs) {
if (elementDef == null) {
ValidationErrorCode error = ValidationErrorCode.SERVICE_DEF_VALIDATION_ERR_ENUM_DEF_NULL_ENUM_ELEMENT;
http://git-wip-us.apache.org/repos/asf/ranger/blob/691c01f5/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceValidator.java
----------------------------------------------------------------------
diff --git a/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceValidator.java b/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceValidator.java
index d3efdc9..1893fb9 100644
--- a/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceValidator.java
+++ b/agents-common/src/main/java/org/apache/ranger/plugin/model/validation/RangerServiceValidator.java
@@ -47,7 +47,7 @@ public class RangerServiceValidator extends RangerValidator {
LOG.debug(String.format("==> RangerServiceValidator.validate(%s, %s)", service, action));
}
- List<ValidationFailureDetails> failures = new ArrayList<ValidationFailureDetails>();
+ List<ValidationFailureDetails> failures = new ArrayList<>();
boolean valid = isValid(service, action, failures);
String message = "";
try {
[2/3] ranger git commit: RANGER-1371 : Remove unneded field
initializers, and unnecessary generic type informations
Posted by co...@apache.org.
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));