Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositeRestrictionProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositeRestrictionProvider.java?rev=1848394&r1=1848393&r2=1848394&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositeRestrictionProvider.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositeRestrictionProvider.java Fri Dec 7 12:39:15 2018 @@ -102,7 +102,7 @@ public final class CompositeRestrictionP @Override public void validateRestrictions(@Nullable String oakPath, @NotNull Tree aceTree) throws RepositoryException { Map<String,RestrictionDefinition> supported = getSupported(oakPath); - Set<String> rNames = new HashSet<String>(); + Set<String> rNames = new HashSet<>(); for (Restriction r : readRestrictions(oakPath, aceTree)) { String name = getName(r); rNames.add(name); @@ -133,7 +133,7 @@ public final class CompositeRestrictionP @NotNull @Override public RestrictionPattern getPattern(@Nullable String oakPath, @NotNull Set<Restriction> restrictions) { - List<RestrictionPattern> patterns = new ArrayList<RestrictionPattern>(); + List<RestrictionPattern> patterns = new ArrayList<>(); for (RestrictionProvider rp : providers) { RestrictionPattern pattern = rp.getPattern(oakPath, restrictions); if (pattern != RestrictionPattern.EMPTY) { @@ -156,7 +156,7 @@ public final class CompositeRestrictionP } private Map<String, RestrictionDefinition> getSupported(@Nullable String oakPath) { - Map<String, RestrictionDefinition> supported = new HashMap<String, RestrictionDefinition>(); + Map<String, RestrictionDefinition> supported = new HashMap<>(); for (RestrictionProvider rp : providers) { for (RestrictionDefinition rd : rp.getSupportedRestrictions(oakPath)) { supported.put(rd.getName(), rd);
Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProvider.java?rev=1848394&r1=1848393&r2=1848394&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProvider.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProvider.java Fri Dec 7 12:39:15 2018 @@ -87,7 +87,7 @@ public class CompositePrincipalProvider @NotNull @Override public Set<Principal> getPrincipals(@NotNull String userID) { - Set<Principal> principals = new HashSet<Principal>(); + Set<Principal> principals = new HashSet<>(); for (PrincipalProvider provider : providers) { principals.addAll(provider.getPrincipals(userID)); } Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBits.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBits.java?rev=1848394&r1=1848393&r2=1848394&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBits.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBits.java Fri Dec 7 12:39:15 2018 @@ -70,7 +70,7 @@ public final class PrivilegeBits impleme private static final Map<Long, String> BUILT_IN_BITS; static { - Map<String, PrivilegeBits> privs = new HashMap<String, PrivilegeBits>(); + Map<String, PrivilegeBits> privs = new HashMap<>(); privs.put(REP_READ_NODES, getInstance(READ_NODES)); privs.put(REP_READ_PROPERTIES, getInstance(READ_PROPERTIES)); privs.put(REP_ADD_PROPERTIES, getInstance(ADD_PROPERTIES)); Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProvider.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProvider.java?rev=1848394&r1=1848393&r2=1848394&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProvider.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProvider.java Fri Dec 7 12:39:15 2018 @@ -48,8 +48,8 @@ public final class PrivilegeBitsProvider private static final Logger log = LoggerFactory.getLogger(PrivilegeBitsProvider.class); - private final Map<PrivilegeBits, Set<String>> bitsToNames = new HashMap<PrivilegeBits, Set<String>>(); - private final Map<String, Set<String>> aggregation = new HashMap<String, Set<String>>(); + private final Map<PrivilegeBits, Set<String>> bitsToNames = new HashMap<>(); + private final Map<String, Set<String>> aggregation = new HashMap<>(); private final Root root; @@ -174,8 +174,8 @@ public final class PrivilegeBitsProvider if (bitsToNames.containsKey(pb)) { privilegeNames = bitsToNames.get(pb); } else { - privilegeNames = new HashSet<String>(); - Set<String> aggregates = new HashSet<String>(); + privilegeNames = new HashSet<>(); + Set<String> aggregates = new HashSet<>(); for (Tree child : privilegesTree.getChildren()) { PrivilegeBits bits = PrivilegeBits.getInstance(child); if (pb.includes(bits)) { Modified: jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/xml/ReferenceChangeTracker.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/xml/ReferenceChangeTracker.java?rev=1848394&r1=1848393&r2=1848394&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/xml/ReferenceChangeTracker.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/xml/ReferenceChangeTracker.java Fri Dec 7 12:39:15 2018 @@ -35,12 +35,12 @@ public class ReferenceChangeTracker { /** * mapping from original uuid to new uuid of mix:referenceable nodes */ - private final Map<String, String> uuidMap = new HashMap<String, String>(); + private final Map<String, String> uuidMap = new HashMap<>(); /** * list of processed reference properties that might need correcting */ - private final List<Object> references = new ArrayList<Object>(); + private final List<Object> references = new ArrayList<>(); /** * Returns the new node id to which {@code oldUUID} has been mapped Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/plugins/tree/TreeTypeProviderTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/plugins/tree/TreeTypeProviderTest.java?rev=1848394&r1=1848393&r2=1848394&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/plugins/tree/TreeTypeProviderTest.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/plugins/tree/TreeTypeProviderTest.java Fri Dec 7 12:39:15 2018 @@ -69,7 +69,7 @@ public class TreeTypeProviderTest extend } }); - tests = new ArrayList<TypeTest>(); + tests = new ArrayList<>(); tests.add(new TypeTest("/", TreeType.DEFAULT)); tests.add(new TypeTest("/content", TreeType.DEFAULT)); tests.add(new TypeTest('/' + JcrConstants.JCR_SYSTEM, TreeType.DEFAULT)); Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParametersTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParametersTest.java?rev=1848394&r1=1848393&r2=1848394&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParametersTest.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParametersTest.java Fri Dec 7 12:39:15 2018 @@ -121,7 +121,7 @@ public class ConfigurationParametersTest assertFalse(params.contains("some")); assertFalse(params.contains("")); - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); map.put("key1", "v"); map.put("key2", "v"); params = ConfigurationParameters.of(map); @@ -133,7 +133,7 @@ public class ConfigurationParametersTest @Test public void testGetConfigValue() { - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); map.put("o1", "v"); ConfigurationParameters options = ConfigurationParameters.of(map); @@ -143,7 +143,7 @@ public class ConfigurationParametersTest @Test public void testGetNullableConfigValue() { - Map<String, String> map = new HashMap<String, String>(); + Map<String, String> map = new HashMap<>(); map.put("o1", "v"); ConfigurationParameters options = ConfigurationParameters.of(map); @@ -220,7 +220,7 @@ public class ConfigurationParametersTest TestObject testObject = new TestObject("t"); Integer int1000 = 1000; - Map<String,Object> m = new HashMap<String, Object>(); + Map<String,Object> m = new HashMap<>(); m.put("TEST", testObject); m.put("String", "1000"); m.put("Int2", 1000); @@ -253,7 +253,7 @@ public class ConfigurationParametersTest TestObject testObject = new TestObject("t"); Integer int1000 = 1000; - Map<String,Object> m = new HashMap<String, Object>(); + Map<String,Object> m = new HashMap<>(); m.put("TEST", testObject); m.put("String", "1000"); m.put("Int2", 1000); @@ -295,13 +295,13 @@ public class ConfigurationParametersTest @Test public void testImpossibleConversion() { - Map<String, Object> map = new HashMap<String, Object>(); + Map<String, Object> map = new HashMap<>(); map.put("string", "v"); map.put("obj", new TestObject("test")); map.put("int", 10); ConfigurationParameters options = ConfigurationParameters.of(map); - Map<String, Class> impossible = new HashMap<String, Class>(); + Map<String, Class> impossible = new HashMap<>(); impossible.put("string", TestObject.class); impossible.put("string", Integer.class); impossible.put("string", Calendar.class); @@ -328,7 +328,7 @@ public class ConfigurationParametersTest Set<TestObject> testObjectSet = ImmutableSet.copyOf(testObjectArray); // map of config value (key) and expected result set. - Map<Object, Set> configValues = new HashMap<Object, Set>(); + Map<Object, Set> configValues = new HashMap<>(); configValues.put("a", ImmutableSet.of("a")); configValues.put(stringArray, stringSet); configValues.put(stringSet, stringSet); @@ -467,7 +467,7 @@ public class ConfigurationParametersTest String[] defaultStrings = new String[]{"abc", "def", "ghi"}; // map of config value (key) and expected result set. - Map<Object, Object[]> configValues = new HashMap<Object, Object[]>(); + Map<Object, Object[]> configValues = new HashMap<>(); configValues.put("a", new String[] {"a"}); configValues.put(stringArray, stringArray); configValues.put(stringSet, stringArray); Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/CompositeCredentialsSupportTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/CompositeCredentialsSupportTest.java?rev=1848394&r1=1848393&r2=1848394&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/CompositeCredentialsSupportTest.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/CompositeCredentialsSupportTest.java Fri Dec 7 12:39:15 2018 @@ -148,7 +148,7 @@ public class CompositeCredentialsSupport private static final class TestCredentialsSupport implements CredentialsSupport { - private final Map<String, Object> attributes = new HashMap<String, Object>(); + private final Map<String, Object> attributes = new HashMap<>(); @NotNull @Override Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlListTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlListTest.java?rev=1848394&r1=1848393&r2=1848394&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlListTest.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlListTest.java Fri Dec 7 12:39:15 2018 @@ -136,7 +136,7 @@ public class AbstractAccessControlListTe NamePathMapper npMapper = mockNamePathMapper(getTestPath()); // map of jcr-path to standard jcr-path - Map<String, String> paths = new HashMap<String, String>(); + Map<String, String> paths = new HashMap<>(); paths.put(null, null); paths.put(getTestPath(), getTestPath()); paths.put("/", "/"); @@ -154,7 +154,7 @@ public class AbstractAccessControlListTe NamePathMapper npMapper = mockNamePathMapper(getTestPath()); // map of jcr-path to oak path - Map<String, String> paths = new HashMap<String, String>(); + Map<String, String> paths = new HashMap<>(); paths.put(null, null); paths.put(getTestPath(), getTestPath()); paths.put("/", "/"); Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlManagerTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlManagerTest.java?rev=1848394&r1=1848393&r2=1848394&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlManagerTest.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlManagerTest.java Fri Dec 7 12:39:15 2018 @@ -135,7 +135,7 @@ public class AbstractAccessControlManage } private static List<String> getInvalidPaths() { - List<String> invalid = new ArrayList<String>(); + List<String> invalid = new ArrayList<>(); invalid.add(""); invalid.add("../../jcr:testRoot"); invalid.add("jcr:testRoot"); Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/TestACL.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/TestACL.java?rev=1848394&r1=1848393&r2=1848394&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/TestACL.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/TestACL.java Fri Dec 7 12:39:15 2018 @@ -36,7 +36,7 @@ import org.jetbrains.annotations.Nullabl */ public final class TestACL extends AbstractAccessControlList { - private final List<JackrabbitAccessControlEntry> entries = new ArrayList<JackrabbitAccessControlEntry>(); + private final List<JackrabbitAccessControlEntry> entries = new ArrayList<>(); private final RestrictionProvider restrictionProvider; public TestACL(@Nullable String jcrPath, Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/PermissionsTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/PermissionsTest.java?rev=1848394&r1=1848393&r2=1848394&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/PermissionsTest.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/PermissionsTest.java Fri Dec 7 12:39:15 2018 @@ -374,7 +374,7 @@ public class PermissionsTest { @Test public void testGetPermissionsFromJackrabbitActions() { TreeLocation tl = TreeLocation.create(existingTree); - Map<String, Long> map = new HashMap<String, Long>(); + Map<String, Long> map = new HashMap<>(); map.put(Session.ACTION_ADD_NODE, Permissions.ADD_NODE); map.put(JackrabbitSession.ACTION_ADD_PROPERTY, Permissions.ADD_PROPERTY); map.put(JackrabbitSession.ACTION_MODIFY_PROPERTY, Permissions.MODIFY_PROPERTY); @@ -395,7 +395,7 @@ public class PermissionsTest { @Test public void testGetPermissionsOnAccessControlledNode() { TreeLocation tl = createNonExistingTreeLocation(PathUtils.ROOT_PATH + AccessControlConstants.REP_POLICY); - Map<String, Long> map = new HashMap<String, Long>(); + Map<String, Long> map = new HashMap<>(); // read -> mapped to read-access-control map.put(Session.ACTION_READ, Permissions.READ_ACCESS_CONTROL); Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionDefinitionImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionDefinitionImplTest.java?rev=1848394&r1=1848393&r2=1848394&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionDefinitionImplTest.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionDefinitionImplTest.java Fri Dec 7 12:39:15 2018 @@ -82,7 +82,7 @@ public class RestrictionDefinitionImplTe @Test public void testNotEqual() { - List<RestrictionDefinition> defs = new ArrayList<RestrictionDefinition>(); + List<RestrictionDefinition> defs = new ArrayList<>(); // - different type defs.add(new RestrictionDefinitionImpl(name, Type.STRING, true)); // - different name Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionImplTest.java?rev=1848394&r1=1848393&r2=1848394&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionImplTest.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionImplTest.java Fri Dec 7 12:39:15 2018 @@ -153,7 +153,7 @@ public class RestrictionImplTest { @Test public void testNotSameHashCode() { - List<Restriction> rs = new ArrayList<Restriction>(); + List<Restriction> rs = new ArrayList<>(); // - different type rs.add(new RestrictionImpl(PropertyStates.createProperty(name, value, Type.STRING), isMandatory)); // - different multi-value status Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalImplTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalImplTest.java?rev=1848394&r1=1848393&r2=1848394&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalImplTest.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalImplTest.java Fri Dec 7 12:39:15 2018 @@ -47,7 +47,7 @@ public class PrincipalImplTest { @Test public void testEquals() { - List<Principal> principals = new ArrayList<Principal>(); + List<Principal> principals = new ArrayList<>(); principals.add(new PrincipalImpl("name")); principals.add(new TestPrincipal("name")); principals.add(new JackrabbitPrincipal() { @@ -64,7 +64,7 @@ public class PrincipalImplTest { @Test public void testNotEquals() { - List<Principal> principals = new ArrayList<Principal>(); + List<Principal> principals = new ArrayList<>(); principals.add(new PrincipalImpl("otherName")); principals.add(new Principal() { @Override Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsTest.java?rev=1848394&r1=1848393&r2=1848394&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsTest.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsTest.java Fri Dec 7 12:39:15 2018 @@ -500,7 +500,7 @@ public class PrivilegeBitsTest implement @Test public void testRetain() { PrivilegeBits pb = READ_NODES_PRIVILEGE_BITS; - List<PrivilegeBits> pbs = new ArrayList<PrivilegeBits>(); + List<PrivilegeBits> pbs = new ArrayList<>(); pbs.add(pb); Random random = new Random(); @@ -706,7 +706,7 @@ public class PrivilegeBitsTest implement public void testCalculatePermissions() { PrivilegeBitsProvider provider = new PrivilegeBitsProvider(Mockito.mock(Root.class)); - Map<PrivilegeBits, Long> simple = new HashMap<PrivilegeBits, Long>(); + Map<PrivilegeBits, Long> simple = new HashMap<>(); simple.put(PrivilegeBits.EMPTY, Permissions.NO_PERMISSION); simple.put(provider.getBits(JCR_READ), Permissions.READ); simple.put(provider.getBits(JCR_LOCK_MANAGEMENT), Permissions.LOCK_MANAGEMENT); Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/PasswordValidationActionTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/PasswordValidationActionTest.java?rev=1848394&r1=1848393&r2=1848394&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/PasswordValidationActionTest.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/PasswordValidationActionTest.java Fri Dec 7 12:39:15 2018 @@ -71,7 +71,7 @@ public class PasswordValidationActionTes @Test public void testPasswordValidationActionInvalid() throws Exception { - List<String> invalid = new ArrayList<String>(); + List<String> invalid = new ArrayList<>(); invalid.add("pw1"); invalid.add("only6C"); invalid.add("12345678"); Modified: jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/util/PasswordUtilTest.java URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/util/PasswordUtilTest.java?rev=1848394&r1=1848393&r2=1848394&view=diff ============================================================================== --- jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/util/PasswordUtilTest.java (original) +++ jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/util/PasswordUtilTest.java Fri Dec 7 12:39:15 2018 @@ -54,7 +54,7 @@ public class PasswordUtilTest { "p{SHA-256}w", ""); - hashedPasswords = new HashMap<String, String>(); + hashedPasswords = new HashMap<>(); for (String pw : plainPasswords) { hashedPasswords.put(pw, PasswordUtil.buildPasswordHash(pw)); } @@ -67,7 +67,7 @@ public class PasswordUtilTest { assertFalse(pw.equals(pwHash)); } - List<Integer[]> l = new ArrayList<Integer[]>(); + List<Integer[]> l = new ArrayList<>(); l.add(new Integer[] {0, 1000}); l.add(new Integer[] {1, 10}); l.add(new Integer[] {8, 50}); @@ -86,7 +86,7 @@ public class PasswordUtilTest { @Test public void testBuildPasswordHashInvalidAlgorithm() throws Exception { - List<String> invalidAlgorithms = new ArrayList<String>(); + List<String> invalidAlgorithms = new ArrayList<>(); invalidAlgorithms.add(""); invalidAlgorithms.add("+"); invalidAlgorithms.add("invalid");
