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 {
