Author: angela
Date: Fri Dec 7 12:39:15 2018
New Revision: 1848394
URL: http://svn.apache.org/viewvc?rev=1848394&view=rev
Log:
OAK-7944 : Minor improvements to oak security code base
- use diamond type
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncConfig.java
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContext.java
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncConfigImpl.java
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicSyncContext.java
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.java
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProvider.java
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfiguration.java
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/AbstractExternalAuthTest.java
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleDynamicMembershipTest.java
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleTestBase.java
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/PreAuthDefaultExternalLoginModuleTest.java
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/TestIdentityProvider.java
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugExcludeDefaultTest.java
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugExcludeImplTest.java
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPermissionProviderTest.java
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/SupportedPathsTest.java
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/VersionTest.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenLoginModule.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/user/LoginModuleImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/ACL.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAuthorizationConfiguration.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissionImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionHook.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/VersionablePathHook.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/PrincipalRestrictionProvider.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/RestrictionProviderImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderRegistration.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeDefinitionWriter.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidator.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizablePropertiesImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/DeclaredMembershipPredicate.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/ImpersonationImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/MembershipProvider.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/MembershipWriter.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/PasswordHistory.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProvider.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/Condition.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/GroupPredicate.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/ResultIterator.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/CompositeConfiguration.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParameters.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlManager.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/Permissions.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProvider.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositeRestrictionProvider.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalProvider.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBits.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProvider.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/xml/ReferenceChangeTracker.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/plugins/tree/TreeTypeProviderTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParametersTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/credentials/CompositeCredentialsSupportTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlListTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlManagerTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/TestACL.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/PermissionsTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionDefinitionImplTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionImplTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/PrincipalImplTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/PasswordValidationActionTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/util/PasswordUtilTest.java
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncConfig.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncConfig.java?rev=1848394&r1=1848393&r2=1848394&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncConfig.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncConfig.java
Fri Dec 7 12:39:15 2018
@@ -150,7 +150,7 @@ public class DefaultSyncConfig {
*/
@NotNull
public Authorizable setAutoMembership(@NotNull String ...
autoMembership) {
- this.autoMembership = new HashSet<String>();
+ this.autoMembership = new HashSet<>();
for (String groupName: autoMembership) {
if (groupName != null && !groupName.trim().isEmpty()) {
this.autoMembership.add(groupName.trim());
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContext.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContext.java?rev=1848394&r1=1848393&r2=1848394&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContext.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/basic/DefaultSyncContext.java
Fri Dec 7 12:39:15 2018
@@ -520,7 +520,7 @@ public class DefaultSyncContext implemen
timer.mark("fetching");
// first get the set of the existing groups that are synced ones
- Map<String, Group> declaredExternalGroups = new HashMap<String,
Group>();
+ Map<String, Group> declaredExternalGroups = new HashMap<>();
Iterator<Group> grpIter = auth.declaredMemberOf();
while (grpIter.hasNext()) {
Group grp = grpIter.next();
@@ -737,7 +737,7 @@ public class DefaultSyncContext implemen
*/
@Nullable
protected Value[] createValues(@NotNull Collection<?> propValues) throws
RepositoryException {
- List<Value> values = new ArrayList<Value>();
+ List<Value> values = new ArrayList<>();
for (Object obj : propValues) {
Value v = createValue(obj);
if (v != null) {
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncConfigImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncConfigImpl.java?rev=1848394&r1=1848393&r2=1848394&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncConfigImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncConfigImpl.java
Fri Dec 7 12:39:15 2018
@@ -317,7 +317,7 @@ public class DefaultSyncConfigImpl exten
* @return the mapping map
*/
private static Map<String, String> createMapping(@NotNull String[]
patterns) {
- Map<String, String> mapping = new HashMap<String, String>();
+ Map<String, String> mapping = new HashMap<>();
for (String pattern: patterns) {
int idx = pattern.indexOf('=');
if (idx > 0) {
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicSyncContext.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicSyncContext.java?rev=1848394&r1=1848393&r2=1848394&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicSyncContext.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DynamicSyncContext.java
Fri Dec 7 12:39:15 2018
@@ -125,7 +125,7 @@ public class DynamicSyncContext extends
if (depth <= 0) {
vs = new Value[0];
} else {
- Set<String> principalsNames = new HashSet<String>();
+ Set<String> principalsNames = new HashSet<>();
collectPrincipalNames(principalsNames,
external.getDeclaredGroups(), depth);
vs = createValues(principalsNames);
}
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java?rev=1848394&r1=1848393&r2=1848394&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java
Fri Dec 7 12:39:15 2018
@@ -412,7 +412,7 @@ public class ExternalLoginModule extends
} else {
creds = credentials;
}
- Map<String, Object> attributes = new HashMap<String, Object>();
+ Map<String, Object> attributes = new HashMap<>();
Object shared = sharedState.get(SHARED_KEY_ATTRIBUTES);
if (shared instanceof Map) {
for (Map.Entry entry : ((Map<?,?>) shared).entrySet()) {
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.java?rev=1848394&r1=1848393&r2=1848394&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.java
Fri Dec 7 12:39:15 2018
@@ -144,9 +144,9 @@ final class Delegatee {
context.setKeepMissing(!purge)
.setForceGroupSync(true)
.setForceUserSync(true);
- List<String> list = new ArrayList<String>();
+ List<String> list = new ArrayList<>();
- List<SyncResult> results = new ArrayList<SyncResult>(batchSize);
+ List<SyncResult> results = new ArrayList<>(batchSize);
for (String userId : userIds) {
results = syncUser(userId, false, results, list);
}
@@ -160,13 +160,13 @@ final class Delegatee {
@NotNull
String[] syncAllUsers(boolean purge) {
try {
- List<String> list = new ArrayList<String>();
+ List<String> list = new ArrayList<>();
context.setKeepMissing(!purge)
.setForceGroupSync(true)
.setForceUserSync(true);
Iterator<SyncedIdentity> it = handler.listIdentities(userMgr);
- List<SyncResult> results = new ArrayList<SyncResult>(batchSize);
+ List<SyncResult> results = new ArrayList<>(batchSize);
while (it.hasNext()) {
SyncedIdentity id = it.next();
if (isMyIDP(id)) {
@@ -185,10 +185,10 @@ final class Delegatee {
*/
@NotNull
String[] syncExternalUsers(@NotNull String[] externalIds) {
- List<String> list = new ArrayList<String>();
+ List<String> list = new ArrayList<>();
context.setForceGroupSync(true).setForceUserSync(true);
- List<SyncResult> results = new ArrayList<SyncResult>(batchSize);
+ List<SyncResult> results = new ArrayList<>(batchSize);
for (String externalId : externalIds) {
ExternalIdentityRef ref =
ExternalIdentityRef.fromString(externalId);
if (!idp.getName().equals(ref.getProviderName())) {
@@ -219,10 +219,10 @@ final class Delegatee {
*/
@NotNull
String[] syncAllExternalUsers() {
- List<String> list = new ArrayList<String>();
+ List<String> list = new ArrayList<>();
context.setForceGroupSync(true).setForceUserSync(true);
try {
- List<SyncResult> results = new ArrayList<SyncResult>(batchSize);
+ List<SyncResult> results = new ArrayList<>(batchSize);
Iterator<ExternalUser> it = idp.listUsers();
while (it.hasNext()) {
ExternalUser user = it.next();
@@ -249,10 +249,10 @@ final class Delegatee {
@NotNull
String[] purgeOrphanedUsers() {
context.setKeepMissing(false);
- List<String> list = new ArrayList<String>();
+ List<String> list = new ArrayList<>();
Iterator<String> orphanedIdentities = internalListOrphanedIdentities();
- List<SyncResult> results = new ArrayList<SyncResult>(batchSize);
+ List<SyncResult> results = new ArrayList<>(batchSize);
while (orphanedIdentities.hasNext()) {
String userId = orphanedIdentities.next();
results = syncUser(userId, true, results, list);
@@ -314,7 +314,7 @@ final class Delegatee {
// make sure there are not pending changes that would fail the
next batches
root.refresh();
}
- return new ArrayList<SyncResult>(size);
+ return new ArrayList<>(size);
}
}
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProvider.java?rev=1848394&r1=1848393&r2=1848394&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProvider.java
Fri Dec 7 12:39:15 2018
@@ -354,7 +354,7 @@ class ExternalGroupPrincipalProvider imp
*/
private final class GroupPrincipalIterator extends
AbstractLazyIterator<Principal> {
- private final Set<String> processed = new HashSet<String>();
+ private final Set<String> processed = new HashSet<>();
private final String queryString;
private final Iterator<? extends ResultRow> rows;
@@ -443,7 +443,7 @@ class ExternalGroupPrincipalProvider imp
private AutoMembershipPrincipals(@NotNull Map<String, String[]>
autoMembershipMapping) {
this.autoMembershipMapping = autoMembershipMapping;
- this.principalMap = new ConcurrentHashMap<String,
Set<Principal>>(autoMembershipMapping.size());
+ this.principalMap = new
ConcurrentHashMap<>(autoMembershipMapping.size());
}
@NotNull
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfiguration.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfiguration.java?rev=1848394&r1=1848393&r2=1848394&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfiguration.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfiguration.java
Fri Dec 7 12:39:15 2018
@@ -260,7 +260,7 @@ public class ExternalPrincipalConfigurat
*/
private static final class SyncHandlerMappingTracker extends
ServiceTracker {
- private Map<ServiceReference, String[]> referenceMap = new
HashMap<ServiceReference, String[]>();
+ private Map<ServiceReference, String[]> referenceMap = new HashMap<>();
public SyncHandlerMappingTracker(@NotNull BundleContext context) {
super(context, SyncHandlerMapping.class.getName(), null);
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/AbstractExternalAuthTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/AbstractExternalAuthTest.java?rev=1848394&r1=1848393&r2=1848394&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/AbstractExternalAuthTest.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/AbstractExternalAuthTest.java
Fri Dec 7 12:39:15 2018
@@ -158,7 +158,7 @@ public abstract class AbstractExternalAu
protected DefaultSyncConfig createSyncConfig() {
DefaultSyncConfig syncConfig = new DefaultSyncConfig();
- Map<String, String> mapping = new HashMap<String, String>();
+ Map<String, String> mapping = new HashMap<>();
mapping.put("name", "name");
mapping.put("email", "email");
mapping.put("profile/name", "profile/name");
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleDynamicMembershipTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleDynamicMembershipTest.java?rev=1848394&r1=1848393&r2=1848394&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleDynamicMembershipTest.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleDynamicMembershipTest.java
Fri Dec 7 12:39:15 2018
@@ -91,10 +91,10 @@ public class ExternalLoginModuleDynamicM
try {
cs = login(new SimpleCredentials(USER_ID, new char[0]));
- Set<String> expectedExternal = new HashSet<String>();
+ Set<String> expectedExternal = new HashSet<>();
calcExpectedPrincipalNames(idp.getUser(USER_ID),
syncConfig.user().getMembershipNestingDepth(), expectedExternal);
- Set<Principal> principals = new
HashSet<Principal>(cs.getAuthInfo().getPrincipals());
+ Set<Principal> principals = new
HashSet<>(cs.getAuthInfo().getPrincipals());
root.refresh();
PrincipalManager principalManager = getPrincipalManager(root);
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleTestBase.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleTestBase.java?rev=1848394&r1=1848393&r2=1848394&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleTestBase.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/ExternalLoginModuleTestBase.java
Fri Dec 7 12:39:15 2018
@@ -42,7 +42,7 @@ public abstract class ExternalLoginModul
private Registration testIdpReg;
private Registration syncHandlerReg;
- protected final HashMap<String, Object> options = new HashMap<String,
Object>();
+ protected final HashMap<String, Object> options = new HashMap<>();
protected Whiteboard whiteboard;
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/PreAuthDefaultExternalLoginModuleTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/PreAuthDefaultExternalLoginModuleTest.java?rev=1848394&r1=1848393&r2=1848394&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/PreAuthDefaultExternalLoginModuleTest.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/PreAuthDefaultExternalLoginModuleTest.java
Fri Dec 7 12:39:15 2018
@@ -86,7 +86,7 @@ public class PreAuthDefaultExternalLogin
AppConfigurationEntry entry3 = new AppConfigurationEntry(
LoginModuleImpl.class.getName(),
AppConfigurationEntry.LoginModuleControlFlag.SUFFICIENT,
- new HashMap<String, Object>());
+ new HashMap<>());
return new AppConfigurationEntry[]{entry1, entry2, entry3};
}
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/TestIdentityProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/TestIdentityProvider.java?rev=1848394&r1=1848393&r2=1848394&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/TestIdentityProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/TestIdentityProvider.java
Fri Dec 7 12:39:15 2018
@@ -40,8 +40,8 @@ public class TestIdentityProvider implem
public static final String DEFAULT_IDP_NAME = "test";
- private final Map<String, ExternalGroup> externalGroups = new
HashMap<String, ExternalGroup>();
- private final Map<String, ExternalUser> externalUsers = new
HashMap<String, ExternalUser>();
+ private final Map<String, ExternalGroup> externalGroups = new HashMap<>();
+ private final Map<String, ExternalUser> externalUsers = new HashMap<>();
private final String idpName;
@@ -158,8 +158,8 @@ public class TestIdentityProvider implem
private final String principalName;
private final ExternalIdentityRef id;
- private final Set<ExternalIdentityRef> groups = new
HashSet<ExternalIdentityRef>();
- private final Map<String, Object> props = new HashMap<String,
Object>();
+ private final Set<ExternalIdentityRef> groups = new HashSet<>();
+ private final Map<String, Object> props = new HashMap<>();
public TestIdentity() {
this("externalId", "principalName", DEFAULT_IDP_NAME);
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugExcludeDefaultTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugExcludeDefaultTest.java?rev=1848394&r1=1848393&r2=1848394&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugExcludeDefaultTest.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugExcludeDefaultTest.java
Fri Dec 7 12:39:15 2018
@@ -81,7 +81,7 @@ public class CugExcludeDefaultTest {
@Test
public void testPrincipals() {
- Set<Principal> principals = new HashSet<Principal>();
+ Set<Principal> principals = new HashSet<>();
principals.add(new PrincipalImpl("test"));
principals.add(new ItemBasedPrincipal() {
@Override
@@ -103,7 +103,7 @@ public class CugExcludeDefaultTest {
@Test
public void testMixedPrincipals() {
- Set<Principal> principals = new HashSet<Principal>();
+ Set<Principal> principals = new HashSet<>();
principals.add(new PrincipalImpl("test"));
principals.add(new SystemUserPrincipal() {
@Override
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugExcludeImplTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugExcludeImplTest.java?rev=1848394&r1=1848393&r2=1848394&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugExcludeImplTest.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugExcludeImplTest.java
Fri Dec 7 12:39:15 2018
@@ -62,7 +62,7 @@ public class CugExcludeImplTest extends
Map<String, Object> m = ImmutableMap.<String,
Object>of("principalNames", principalNames);
activate(m);
- Set<Principal> all = new HashSet<Principal>();
+ Set<Principal> all = new HashSet<>();
for (String name : principalNames) {
Principal p = new PrincipalImpl(name);
assertTrue(exclude.isExcluded(ImmutableSet.of(p)));
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPermissionProviderTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPermissionProviderTest.java?rev=1848394&r1=1848393&r2=1848394&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPermissionProviderTest.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPermissionProviderTest.java
Fri Dec 7 12:39:15 2018
@@ -55,7 +55,7 @@ import static org.junit.Assert.fail;
public class CugPermissionProviderTest extends AbstractCugTest implements
NodeTypeConstants {
- private static final Map<String, Boolean> PATH_INCUG_MAP = new
HashMap<String, Boolean>();
+ private static final Map<String, Boolean> PATH_INCUG_MAP = new HashMap<>();
static {
PATH_INCUG_MAP.put(SUPPORTED_PATH, false);
PATH_INCUG_MAP.put("/content/a", true);
@@ -275,7 +275,7 @@ public class CugPermissionProviderTest e
public void testSupportedPermissionsByTreePermission() {
TreePermission rootTp =
cugPermProvider.getTreePermission(root.getTree("/"), TreePermission.EMPTY);
- Map<TreePermission, Boolean> tpMap = new HashMap<TreePermission,
Boolean>();
+ Map<TreePermission, Boolean> tpMap = new HashMap<>();
TreePermission contentTp =
cugPermProvider.getTreePermission(root.getTree(SUPPORTED_PATH), rootTp);
tpMap.put(contentTp, false);
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/SupportedPathsTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/SupportedPathsTest.java?rev=1848394&r1=1848393&r2=1848394&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/SupportedPathsTest.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/SupportedPathsTest.java
Fri Dec 7 12:39:15 2018
@@ -34,7 +34,7 @@ public class SupportedPathsTest {
public void testIncludes() {
SupportedPaths supportedPaths = new
SupportedPaths(ImmutableSet.of("/content"));
- Map<String, Boolean> pathMap = new HashMap<String, Boolean>();
+ Map<String, Boolean> pathMap = new HashMap<>();
pathMap.put("/content", true);
pathMap.put("/content/a", true);
pathMap.put("/content/a/rep:cugPolicy", true);
@@ -59,7 +59,7 @@ public class SupportedPathsTest {
public void testMayContainCug() {
SupportedPaths supportedPaths = new
SupportedPaths(ImmutableSet.of("/content/a"));
- Map<String, Boolean> pathMap = new HashMap<String, Boolean>();
+ Map<String, Boolean> pathMap = new HashMap<>();
pathMap.put("/", true);
pathMap.put("/content", true);
pathMap.put("/jcr:system", false);
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/VersionTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/VersionTest.java?rev=1848394&r1=1848393&r2=1848394&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/VersionTest.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/VersionTest.java
Fri Dec 7 12:39:15 2018
@@ -60,8 +60,8 @@ public class VersionTest extends Abstrac
private Root testRoot;
private ReadOnlyVersionManager versionManager;
- private List<String> readAccess = new ArrayList<String>();
- private List<String> noReadAccess = new ArrayList<String>();
+ private List<String> readAccess = new ArrayList<>();
+ private List<String> noReadAccess = new ArrayList<>();
@Before
@Override
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java?rev=1848394&r1=1848393&r2=1848394&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/SecurityProviderImpl.java
Fri Dec 7 12:39:15 2018
@@ -141,7 +141,7 @@ public class SecurityProviderImpl implem
@NotNull
@Override
public Iterable<? extends SecurityConfiguration> getConfigurations() {
- Set<SecurityConfiguration> scs = new HashSet<SecurityConfiguration>();
+ Set<SecurityConfiguration> scs = new HashSet<>();
scs.add(authenticationConfiguration);
scs.add(authorizationConfiguration);
scs.add(userConfiguration);
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenLoginModule.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenLoginModule.java?rev=1848394&r1=1848393&r2=1848394&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenLoginModule.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/token/TokenLoginModule.java
Fri Dec 7 12:39:15 2018
@@ -249,7 +249,7 @@ public final class TokenLoginModule exte
@Nullable
private static AuthInfo getAuthInfo(@Nullable TokenInfo tokenInfo,
@NotNull Set<? extends Principal> principals) {
if (tokenInfo != null) {
- Map<String, Object> attributes = new HashMap<String, Object>();
+ Map<String, Object> attributes = new HashMap<>();
Map<String, String> publicAttributes =
tokenInfo.getPublicAttributes();
for (String attrName : publicAttributes.keySet()) {
attributes.put(attrName, publicAttributes.get(attrName));
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/user/LoginModuleImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/user/LoginModuleImpl.java?rev=1848394&r1=1848393&r2=1848394&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/user/LoginModuleImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/user/LoginModuleImpl.java
Fri Dec 7 12:39:15 2018
@@ -101,7 +101,7 @@ public final class LoginModuleImpl exten
private static final Logger log =
LoggerFactory.getLogger(LoginModuleImpl.class);
- protected static final Set<Class> SUPPORTED_CREDENTIALS = new
HashSet<Class>(3);
+ protected static final Set<Class> SUPPORTED_CREDENTIALS = new HashSet<>(3);
static {
SUPPORTED_CREDENTIALS.add(SimpleCredentials.class);
SUPPORTED_CREDENTIALS.add(GuestCredentials.class);
@@ -263,7 +263,7 @@ public final class LoginModuleImpl exten
} else {
creds = credentials;
}
- Map<String, Object> attributes = new HashMap<String, Object>();
+ Map<String, Object> attributes = new HashMap<>();
Object shared = sharedState.get(SHARED_KEY_ATTRIBUTES);
if (shared instanceof Map) {
for (Object key : ((Map) shared).keySet()) {
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/ACL.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/ACL.java?rev=1848394&r1=1848393&r2=1848394&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/ACL.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/ACL.java
Fri Dec 7 12:39:15 2018
@@ -48,7 +48,7 @@ abstract class ACL extends AbstractAcces
private static final Logger log = LoggerFactory.getLogger(ACL.class);
- private final List<ACE> entries = new ArrayList<ACE>();
+ private final List<ACE> entries = new ArrayList<>();
ACL(@Nullable String oakPath, @Nullable List<ACE> entries,
@NotNull NamePathMapper namePathMapper) {
@@ -110,7 +110,7 @@ abstract class ACL extends AbstractAcces
if (restrictions == null && mvRestrictions == null) {
rs = Collections.emptySet();
} else {
- rs = new HashSet<Restriction>();
+ rs = new HashSet<>();
if (restrictions != null) {
for (String jcrName : restrictions.keySet()) {
String oakName = getNamePathMapper().getOakName(jcrName);
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImpl.java?rev=1848394&r1=1848393&r2=1848394&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlManagerImpl.java
Fri Dec 7 12:39:15 2018
@@ -135,7 +135,7 @@ public class AccessControlManagerImpl ex
Tree tree = getTree(oakPath, Permissions.READ_ACCESS_CONTROL, true);
AccessControlPolicy policy = createACL(oakPath, tree, false);
- List<AccessControlPolicy> policies = new
ArrayList<AccessControlPolicy>(2);
+ List<AccessControlPolicy> policies = new ArrayList<>(2);
if (policy != null) {
policies.add(policy);
}
@@ -154,7 +154,7 @@ public class AccessControlManagerImpl ex
Root r = getRoot().getContentSession().getLatestRoot();
tree = r.getTree(tree.getPath());
- List<AccessControlPolicy> effective = new
ArrayList<AccessControlPolicy>();
+ List<AccessControlPolicy> effective = new ArrayList<>();
AccessControlPolicy policy = createACL(oakPath, tree, true);
if (policy != null) {
effective.add(policy);
@@ -492,7 +492,7 @@ public class AccessControlManagerImpl ex
if (accessControlledTree.exists() && Util.isAccessControlled(oakPath,
accessControlledTree, ntMgr)) {
Tree aclTree = accessControlledTree.getChild(aclName);
if (aclTree.exists()) {
- List<ACE> entries = new ArrayList<ACE>();
+ List<ACE> entries = new ArrayList<>();
for (Tree child : aclTree.getChildren()) {
if (Util.isACE(child, ntMgr)) {
ACE ace = createACE(oakPath, child,
restrictionProvider);
@@ -517,7 +517,7 @@ public class AccessControlManagerImpl ex
Root root = getRoot();
Result aceResult =
searchAces(Collections.<Principal>singleton(principal), root);
RestrictionProvider restrProvider = new
PrincipalRestrictionProvider(restrictionProvider);
- List<ACE> entries = new ArrayList<ACE>();
+ List<ACE> entries = new ArrayList<>();
for (ResultRow row : aceResult.getRows()) {
Tree aceTree = root.getTree(row.getPath());
if (Util.isACE(aceTree, ntMgr)) {
@@ -749,7 +749,7 @@ public class AccessControlManagerImpl ex
@Override
public Privilege[] getPrivileges() {
- Set<Privilege> privileges = new HashSet<Privilege>();
+ Set<Privilege> privileges = new HashSet<>();
for (String name :
bitsProvider.getPrivilegeNames(getPrivilegeBits())) {
try {
privileges.add(getPrivilegeManager().getPrivilege(name));
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAuthorizationConfiguration.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAuthorizationConfiguration.java?rev=1848394&r1=1848393&r2=1848394&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAuthorizationConfiguration.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAuthorizationConfiguration.java
Fri Dec 7 12:39:15 2018
@@ -146,7 +146,7 @@ public class CompositeAuthorizationConfi
case 0: return RestrictionProvider.EMPTY;
case 1: return configurations.get(0).getRestrictionProvider();
default:
- List<RestrictionProvider> rps = new
ArrayList<RestrictionProvider>(configurations.size());
+ List<RestrictionProvider> rps = new
ArrayList<>(configurations.size());
for (AuthorizationConfiguration c : configurations) {
RestrictionProvider rp = c.getRestrictionProvider();
if (RestrictionProvider.EMPTY != rp) {
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissionImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissionImpl.java?rev=1848394&r1=1848393&r2=1848394&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissionImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/CompiledPermissionImpl.java
Fri Dec 7 12:39:15 2018
@@ -99,8 +99,8 @@ final class CompiledPermissionImpl imple
// setup
this.store = store;
- Set<String> userNames = new HashSet<String>(principals.size());
- Set<String> groupNames = new HashSet<String>(principals.size());
+ Set<String> userNames = new HashSet<>(principals.size());
+ Set<String> groupNames = new HashSet<>(principals.size());
for (Principal principal : principals) {
if (GroupPrincipals.isGroup(principal)) {
groupNames.add(principal.getName());
@@ -239,7 +239,7 @@ final class CompiledPermissionImpl imple
@NotNull
private TreePermission buildParentPermission(@NotNull Tree tree) {
- List<Tree> trees = new ArrayList<Tree>();
+ List<Tree> trees = new ArrayList<>();
while (!tree.isRoot()) {
tree = tree.getParent();
trees.add(0, tree);
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionHook.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionHook.java?rev=1848394&r1=1848393&r2=1848394&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionHook.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionHook.java
Fri Dec 7 12:39:15 2018
@@ -77,8 +77,8 @@ public class PermissionHook implements P
private TypePredicate isACE;
private TypePredicate isGrantACE;
- private Map<String, PermissionStoreEditor> modified = new HashMap<String,
PermissionStoreEditor>();
- private Map<String, PermissionStoreEditor> deleted = new HashMap<String,
PermissionStoreEditor>();
+ private Map<String, PermissionStoreEditor> modified = new HashMap<>();
+ private Map<String, PermissionStoreEditor> deleted = new HashMap<>();
public PermissionHook(@NotNull String workspaceName, @NotNull
RestrictionProvider restrictionProvider,
@NotNull MountInfoProvider mountInfoProvider,
@NotNull RootProvider rootProvider,
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/VersionablePathHook.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/VersionablePathHook.java?rev=1848394&r1=1848393&r2=1848394&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/VersionablePathHook.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/VersionablePathHook.java
Fri Dec 7 12:39:15 2018
@@ -69,7 +69,7 @@ public class VersionablePathHook impleme
ReadWriteVersionManager vMgr = new ReadWriteVersionManager(vsRoot,
rootBuilder);
ReadOnlyNodeTypeManager ntMgr =
ReadOnlyNodeTypeManager.getInstance(providerCtx.getRootProvider().createReadOnlyRoot(rootBuilder.getNodeState()),
NamePathMapper.DEFAULT);
- List<CommitFailedException> exceptions = new
ArrayList<CommitFailedException>();
+ List<CommitFailedException> exceptions = new ArrayList<>();
after.compareAgainstBaseState(before,
new Diff(vMgr, ntMgr, new Node(rootBuilder), exceptions));
if (!exceptions.isEmpty()) {
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/PrincipalRestrictionProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/PrincipalRestrictionProvider.java?rev=1848394&r1=1848393&r2=1848394&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/PrincipalRestrictionProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/PrincipalRestrictionProvider.java
Fri Dec 7 12:39:15 2018
@@ -55,7 +55,7 @@ public class PrincipalRestrictionProvide
@NotNull
@Override
public Set<RestrictionDefinition> getSupportedRestrictions(@Nullable
String oakPath) {
- Set<RestrictionDefinition> definitions = new
HashSet<RestrictionDefinition>(base.getSupportedRestrictions(oakPath));
+ Set<RestrictionDefinition> definitions = new
HashSet<>(base.getSupportedRestrictions(oakPath));
definitions.add(new RestrictionDefinitionImpl(REP_NODE_PATH,
Type.PATH, true));
return definitions;
}
@@ -79,7 +79,7 @@ public class PrincipalRestrictionProvide
@NotNull
@Override
public Set<Restriction> readRestrictions(@Nullable String oakPath,
@NotNull Tree aceTree) {
- Set<Restriction> restrictions = new
HashSet<Restriction>(base.readRestrictions(oakPath, aceTree));
+ Set<Restriction> restrictions = new
HashSet<>(base.readRestrictions(oakPath, aceTree));
String value = (oakPath == null) ? "" : oakPath;
PropertyState nodePathProp =
PropertyStates.createProperty(REP_NODE_PATH, value, Type.PATH);
restrictions.add(new RestrictionImpl(nodePathProp, true));
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/RestrictionProviderImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/RestrictionProviderImpl.java?rev=1848394&r1=1848393&r2=1848394&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/RestrictionProviderImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/RestrictionProviderImpl.java
Fri Dec 7 12:39:15 2018
@@ -86,7 +86,7 @@ public class RestrictionProviderImpl ext
if (oakPath == null) {
return RestrictionPattern.EMPTY;
} else {
- List<RestrictionPattern> patterns = new
ArrayList<RestrictionPattern>(NUMBER_OF_DEFINITIONS);
+ List<RestrictionPattern> patterns = new
ArrayList<>(NUMBER_OF_DEFINITIONS);
PropertyState glob = tree.getProperty(REP_GLOB);
if (glob != null) {
patterns.add(GlobPattern.create(oakPath,
glob.getValue(Type.STRING)));
@@ -114,7 +114,7 @@ public class RestrictionProviderImpl ext
if (oakPath == null || restrictions.isEmpty()) {
return RestrictionPattern.EMPTY;
} else {
- List<RestrictionPattern> patterns = new
ArrayList<RestrictionPattern>(NUMBER_OF_DEFINITIONS);
+ List<RestrictionPattern> patterns = new
ArrayList<>(NUMBER_OF_DEFINITIONS);
for (Restriction r : restrictions) {
String name = r.getDefinition().getName();
if (REP_GLOB.equals(name)) {
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderRegistration.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderRegistration.java?rev=1848394&r1=1848393&r2=1848394&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderRegistration.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/internal/SecurityProviderRegistration.java
Fri Dec 7 12:39:15 2018
@@ -462,7 +462,7 @@ public class SecurityProviderRegistratio
// Register the SecurityProvider.
- Dictionary<String, Object> properties = new Hashtable<String,
Object>();
+ Dictionary<String, Object> properties = new Hashtable<>();
properties.put("type", "default");
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImpl.java?rev=1848394&r1=1848393&r2=1848394&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/principal/PrincipalProviderImpl.java
Fri Dec 7 12:39:15 2018
@@ -93,7 +93,7 @@ class PrincipalProviderImpl implements P
@NotNull
@Override
public Set<? extends Principal> getPrincipals(@NotNull String userID) {
- Set<Principal> principals = new HashSet<Principal>();
+ Set<Principal> principals = new HashSet<>();
try {
Authorizable authorizable = userManager.getAuthorizable(userID);
if (authorizable != null && !authorizable.isGroup()) {
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeDefinitionWriter.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeDefinitionWriter.java?rev=1848394&r1=1848393&r2=1848394&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeDefinitionWriter.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeDefinitionWriter.java
Fri Dec 7 12:39:15 2018
@@ -150,7 +150,7 @@ class PrivilegeDefinitionWriter implemen
}
private static Collection<PrivilegeDefinition> getBuiltInDefinitions() {
- Map<String, PrivilegeDefinition> definitions = new
LinkedHashMap<String, PrivilegeDefinition>();
+ Map<String, PrivilegeDefinition> definitions = new LinkedHashMap<>();
for (String privilegeName : NON_AGGREGATE_PRIVILEGES) {
PrivilegeDefinition def = new
ImmutablePrivilegeDefinition(privilegeName, false, null);
definitions.put(privilegeName, def);
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidator.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidator.java?rev=1848394&r1=1848393&r2=1848394&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidator.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidator.java
Fri Dec 7 12:39:15 2018
@@ -238,7 +238,7 @@ class PrivilegeValidator extends Default
}
private static Set<String> resolveAggregates(Set<String> declared,
Map<String, PrivilegeDefinition> definitions) throws CommitFailedException {
- Set<String> aggregateNames = new HashSet<String>();
+ Set<String> aggregateNames = new HashSet<>();
for (String name : declared) {
PrivilegeDefinition d = definitions.get(name);
if (d == null) {
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizablePropertiesImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizablePropertiesImpl.java?rev=1848394&r1=1848393&r2=1848394&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizablePropertiesImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizablePropertiesImpl.java
Fri Dec 7 12:39:15 2018
@@ -69,7 +69,7 @@ class AuthorizablePropertiesImpl impleme
TreeLocation location = getLocation(tree, oakPath);
Tree parent = location.getTree();
if (parent != null && Text.isDescendantOrEqual(tree.getPath(),
parent.getPath())) {
- List<String> l = new ArrayList<String>();
+ List<String> l = new ArrayList<>();
for (PropertyState property : parent.getProperties()) {
String propName = property.getName();
if (isAuthorizableProperty(tree, location.getChild(propName),
false)) {
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/DeclaredMembershipPredicate.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/DeclaredMembershipPredicate.java?rev=1848394&r1=1848393&r2=1848394&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/DeclaredMembershipPredicate.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/DeclaredMembershipPredicate.java
Fri Dec 7 12:39:15 2018
@@ -39,7 +39,7 @@ public class DeclaredMembershipPredicate
private final MembershipProvider membershipProvider;
private final Iterator<String> contentIdIterator;
- private final Set<String> declaredMemberContentIds = new HashSet<String>();
+ private final Set<String> declaredMemberContentIds = new HashSet<>();
public DeclaredMembershipPredicate(UserManagerImpl userManager, String
groupId) {
this.membershipProvider = userManager.getMembershipProvider();
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/ImpersonationImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/ImpersonationImpl.java?rev=1848394&r1=1848393&r2=1848394&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/ImpersonationImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/ImpersonationImpl.java
Fri Dec 7 12:39:15 2018
@@ -66,7 +66,7 @@ class ImpersonationImpl implements Imper
if (impersonators.isEmpty()) {
return PrincipalIteratorAdapter.EMPTY;
} else {
- Set<Principal> s = new HashSet<Principal>();
+ Set<Principal> s = new HashSet<>();
for (final String pName : impersonators) {
Principal p = principalManager.getPrincipal(pName);
if (p == null) {
@@ -128,7 +128,7 @@ class ImpersonationImpl implements Imper
return false;
}
- Set<String> principalNames = new HashSet<String>();
+ Set<String> principalNames = new HashSet<>();
for (Principal principal : subject.getPrincipals()) {
principalNames.add(principal.getName());
}
@@ -154,7 +154,7 @@ class ImpersonationImpl implements Imper
@NotNull
private Set<String> getImpersonatorNames(@NotNull Tree userTree) {
- Set<String> princNames = new HashSet<String>();
+ Set<String> princNames = new HashSet<>();
PropertyState impersonators = userTree.getProperty(REP_IMPERSONATORS);
if (impersonators != null) {
for (String v : impersonators.getValue(STRINGS)) {
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/MembershipProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/MembershipProvider.java?rev=1848394&r1=1848393&r2=1848394&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/MembershipProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/MembershipProvider.java
Fri Dec 7 12:39:15 2018
@@ -135,7 +135,7 @@ class MembershipProvider extends Authori
*/
@NotNull
Iterator<String> getMembership(@NotNull Tree authorizableTree, final
boolean includeInherited) {
- return getMembership(authorizableTree, includeInherited, new
HashSet<String>());
+ return getMembership(authorizableTree, includeInherited, new
HashSet<>());
}
/**
@@ -220,7 +220,7 @@ class MembershipProvider extends Authori
*/
@NotNull
Iterator<String> getMembers(@NotNull Tree groupTree, boolean
includeInherited) {
- return getMembers(groupTree, getContentID(groupTree),
includeInherited, new HashSet<String>());
+ return getMembers(groupTree, getContentID(groupTree),
includeInherited, new HashSet<>());
}
@NotNull
@@ -482,7 +482,7 @@ class MembershipProvider extends Authori
*/
protected void remember(@NotNull Tree groupTree) {
if (groupTrees == null) {
- groupTrees = new ArrayList<Tree>();
+ groupTrees = new ArrayList<>();
}
groupTrees.add(groupTree);
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/MembershipWriter.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/MembershipWriter.java?rev=1848394&r1=1848393&r2=1848394&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/MembershipWriter.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/MembershipWriter.java
Fri Dec 7 12:39:15 2018
@@ -83,7 +83,7 @@ public class MembershipWriter {
membersList.getChildren().iterator()
);
- Set<String> failed = new HashSet<String>(memberIds.size());
+ Set<String> failed = new HashSet<>(memberIds.size());
int bestCount = membershipSizeThreshold;
PropertyState bestProperty = null;
Tree bestTree = null;
@@ -137,7 +137,7 @@ public class MembershipWriter {
// for simplicity this is achieved by introducing new tree(s)
if ((propCnt + memberIds.size()) > membershipSizeThreshold) {
while (!memberIds.isEmpty()) {
- Set<String> s = new HashSet<String>();
+ Set<String> s = new HashSet<>();
Iterator<String> it = memberIds.keySet().iterator();
while (propCnt < membershipSizeThreshold && it.hasNext()) {
s.add(it.next());
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/PasswordHistory.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/PasswordHistory.java?rev=1848394&r1=1848393&r2=1848394&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/PasswordHistory.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/PasswordHistory.java
Fri Dec 7 12:39:15 2018
@@ -86,7 +86,7 @@ final class PasswordHistory implements U
PropertyState historyProp =
passwordTree.getProperty(UserConstants.REP_PWD_HISTORY);
// insert the current (old) password at the beginning of the
password history
- List<String> historyEntries = (historyProp == null) ? new
ArrayList<String>() : Lists.newArrayList(historyProp.getValue(Type.STRINGS));
+ List<String> historyEntries = (historyProp == null) ? new
ArrayList<>() : Lists.newArrayList(historyProp.getValue(Type.STRINGS));
historyEntries.add(0, currentPasswordHash);
/* remove oldest history entries exceeding configured history max
size (e.g. after
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java?rev=1848394&r1=1848393&r2=1848394&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java
Fri Dec 7 12:39:15 2018
@@ -150,7 +150,7 @@ class UserImporter implements ProtectedP
* memberships during processing. if both would be handled only via the
reference tracker {@link Membership#process()}
* would remove the members from the property importer.
*/
- private Map<String, Membership> memberships = new HashMap<String,
Membership>();
+ private Map<String, Membership> memberships = new HashMap<>();
/**
* Temporary store for the pw an imported new user to be able to call
@@ -161,7 +161,7 @@ class UserImporter implements ProtectedP
/**
* Remember all new principals for impersonation handling.
*/
- private Map<String, Principal> principals = new HashMap<String,
Principal>();
+ private Map<String, Principal> principals = new HashMap<>();
UserImporter(ConfigurationParameters config) {
importBehavior = UserUtil.getImportBehavior(config);
@@ -267,7 +267,7 @@ class UserImporter implements ProtectedP
of impersonators
*/
if (principals == null) {
- principals = new HashMap<String, Principal>();
+ principals = new HashMap<>();
}
principals.put(principalName, a.getPrincipal());
@@ -370,7 +370,7 @@ class UserImporter implements ProtectedP
}
memberships.clear();
- List<Object> processed = new ArrayList<Object>();
+ List<Object> processed = new ArrayList<>();
for (Iterator<Object> it = referenceTracker.getProcessedReferences();
it.hasNext(); ) {
Object reference = it.next();
if (reference instanceof Membership) {
@@ -558,7 +558,7 @@ class UserImporter implements ProtectedP
private final String authorizablePath;
- private final Set<String> members = new TreeSet<String>();
+ private final Set<String> members = new TreeSet<>();
Membership(String authorizablePath) {
this.authorizablePath = authorizablePath;
@@ -582,7 +582,7 @@ class UserImporter implements ProtectedP
Group gr = (Group) a;
// 1. collect members to add and to remove.
- Map<String, Authorizable> toRemove = new HashMap<String,
Authorizable>();
+ Map<String, Authorizable> toRemove = new HashMap<>();
for (Iterator<Authorizable> declMembers = gr.getDeclaredMembers();
declMembers.hasNext(); ) {
Authorizable dm = declMembers.next();
toRemove.put(dm.getID(), dm);
@@ -660,7 +660,7 @@ class UserImporter implements ProtectedP
private final class Impersonators {
private final String userPath;
- private final Set<String> principalNames = new HashSet<String>();
+ private final Set<String> principalNames = new HashSet<>();
private Impersonators(String userPath, List<? extends TextValue>
values) {
this.userPath = userPath;
@@ -678,13 +678,13 @@ class UserImporter implements ProtectedP
Impersonation imp = checkNotNull(((User) a).getImpersonation());
// 1. collect principals to add and to remove.
- Map<String, Principal> toRemove = new HashMap<String, Principal>();
+ Map<String, Principal> toRemove = new HashMap<>();
for (PrincipalIterator pit = imp.getImpersonators();
pit.hasNext(); ) {
Principal p = pit.nextPrincipal();
toRemove.put(p.getName(), p);
}
- List<String> toAdd = new ArrayList<String>();
+ List<String> toAdd = new ArrayList<>();
for (final String principalName : principalNames) {
if (toRemove.remove(principalName) == null) {
// add it to the list of new impersonators to be added.
@@ -699,7 +699,7 @@ class UserImporter implements ProtectedP
handleFailure("Failed to revoke impersonation for " +
principalName + " on " + a);
}
}
- List<String> nonExisting = new ArrayList<String>();
+ List<String> nonExisting = new ArrayList<>();
for (String principalName : toAdd) {
Principal principal = (principals.containsKey(principalName)) ?
principals.get(principalName) :
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProvider.java?rev=1848394&r1=1848393&r2=1848394&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserPrincipalProvider.java
Fri Dec 7 12:39:15 2018
@@ -128,7 +128,7 @@ class UserPrincipalProvider implements P
@NotNull
@Override
public Set<? extends Principal> getPrincipals(@NotNull String userID) {
- Set<Principal> principals = new HashSet<Principal>();
+ Set<Principal> principals = new HashSet<>();
Tree tree = userProvider.getAuthorizable(userID);
if (tree != null && UserUtil.isType(tree, AuthorizableType.USER)) {
Principal userPrincipal = createUserPrincipal(userID, tree);
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/Condition.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/Condition.java?rev=1848394&r1=1848393&r2=1848394&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/Condition.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/Condition.java
Fri Dec 7 12:39:15 2018
@@ -158,7 +158,7 @@ interface Condition {
//-------------------------------------------------< Compound Condition
>---
abstract class Compound implements Condition, Iterable<Condition> {
- private final List<Condition> conditions = new ArrayList<Condition>();
+ private final List<Condition> conditions = new ArrayList<>();
public Compound(Condition condition1, Condition condition2) {
conditions.add(condition1);
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/GroupPredicate.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/GroupPredicate.java?rev=1848394&r1=1848393&r2=1848394&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/GroupPredicate.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/GroupPredicate.java
Fri Dec 7 12:39:15 2018
@@ -38,7 +38,7 @@ class GroupPredicate implements Predicat
static final Logger log = LoggerFactory.getLogger(GroupPredicate.class);
private final Iterator<Authorizable> membersIterator;
- private final Set<String> memberIds = new HashSet<String>();
+ private final Set<String> memberIds = new HashSet<>();
GroupPredicate(UserManager userManager, String groupId, boolean
declaredMembersOnly) throws RepositoryException {
Authorizable authorizable = userManager.getAuthorizable(groupId);
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/ResultIterator.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/ResultIterator.java?rev=1848394&r1=1848393&r2=1848394&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/ResultIterator.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/ResultIterator.java
Fri Dec 7 12:39:15 2018
@@ -69,7 +69,7 @@ public final class ResultIterator<T> imp
// no constraints on offset nor max -> return the original
iterator.
return iterator;
} else {
- return new ResultIterator<T>(offset, max, iterator);
+ return new ResultIterator<>(offset, max, iterator);
}
}
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/CompositeConfiguration.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/CompositeConfiguration.java?rev=1848394&r1=1848393&r2=1848394&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/CompositeConfiguration.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/CompositeConfiguration.java
Fri Dec 7 12:39:15 2018
@@ -69,7 +69,7 @@ public abstract class CompositeConfigura
*/
private static final int NO_RANKING = Integer.MIN_VALUE;
- private final List<T> configurations = new CopyOnWriteArrayList<T>();
+ private final List<T> configurations = new CopyOnWriteArrayList<>();
private final Ranking rankings = new Ranking();
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParameters.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParameters.java?rev=1848394&r1=1848393&r2=1848394&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParameters.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParameters.java
Fri Dec 7 12:39:15 2018
@@ -81,7 +81,7 @@ public final class ConfigurationParamete
*/
@NotNull
public static ConfigurationParameters of(@NotNull
ConfigurationParameters... params) {
- Map<String, Object> m = new HashMap<String, Object>();
+ Map<String, Object> m = new HashMap<>();
for (ConfigurationParameters cp : params) {
if (cp != null) {
m.putAll(cp.options);
@@ -100,7 +100,7 @@ public final class ConfigurationParamete
if (properties.isEmpty()) {
return EMPTY;
}
- Map<String, Object> options = new HashMap<String,
Object>(properties.size());
+ Map<String, Object> options = new HashMap<>(properties.size());
for (Object name : properties.keySet()) {
final String key = name.toString();
options.put(key, properties.get(key));
@@ -118,7 +118,7 @@ public final class ConfigurationParamete
if (properties.isEmpty()) {
return EMPTY;
}
- Map<String, Object> options = new HashMap<String,
Object>(properties.size());
+ Map<String, Object> options = new HashMap<>(properties.size());
for (Enumeration<String> keys = properties.keys();
keys.hasMoreElements();) {
String key = keys.nextElement();
options.put(key, properties.get(key));
@@ -139,7 +139,7 @@ public final class ConfigurationParamete
if (map instanceof ConfigurationParameters) {
return (ConfigurationParameters) map;
}
- Map<String, Object> options = new HashMap<String, Object>(map.size());
+ Map<String, Object> options = new HashMap<>(map.size());
for (Map.Entry<?,?> e : map.entrySet()) {
options.put(String.valueOf(e.getKey()), e.getValue());
}
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlManager.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlManager.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/accesscontrol/AbstractAccessControlManager.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlManager.java
Fri Dec 7 12:39:15 2018
@@ -217,7 +217,7 @@ public abstract class AbstractAccessCont
if (pNames.isEmpty()) {
return new Privilege[0];
} else {
- Set<Privilege> privileges = new HashSet<Privilege>(pNames.size());
+ Set<Privilege> privileges = new HashSet<>(pNames.size());
for (String name : pNames) {
privileges.add(privilegeManager.getPrivilege(namePathMapper.getJcrName(name)));
}
@@ -242,7 +242,7 @@ public abstract class AbstractAccessCont
log.debug("No privileges passed -> allowed.");
return true;
} else {
- Set<String> privilegeNames = new
HashSet<String>(privileges.length);
+ Set<String> privilegeNames = new HashSet<>(privileges.length);
for (Privilege privilege : privileges) {
privilegeNames.add(namePathMapper.getOakName(privilege.getName()));
}
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/Permissions.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/Permissions.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/permission/Permissions.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/permission/Permissions.java
Fri Dec 7 12:39:15 2018
@@ -160,7 +160,7 @@ public final class Permissions {
USER_MANAGEMENT,
INDEX_DEFINITION_MANAGEMENT);
- public static final Map<Long, String> PERMISSION_NAMES = new
LinkedHashMap<Long, String>();
+ public static final Map<Long, String> PERMISSION_NAMES = new
LinkedHashMap<>();
static {
PERMISSION_NAMES.put(ALL, "ALL");
PERMISSION_NAMES.put(READ, "READ");
@@ -190,7 +190,7 @@ public final class Permissions {
PERMISSION_NAMES.put(INDEX_DEFINITION_MANAGEMENT,
"INDEX_DEFINITION_MANAGEMENT");
}
- private static final Map<String, Long> PERMISSION_LOOKUP = new
LinkedHashMap<String, Long>();
+ private static final Map<String, Long> PERMISSION_LOOKUP = new
LinkedHashMap<>();
static {
PERMISSION_LOOKUP.put("ALL", ALL);
PERMISSION_LOOKUP.put("READ", READ);
@@ -230,7 +230,7 @@ public final class Permissions {
JackrabbitSession.ACTION_REMOVE_PROPERTY
);
- private static final Map<String, Long> ACTIONS_MAP = new
LinkedHashMap<String, Long>();
+ private static final Map<String, Long> ACTIONS_MAP = new LinkedHashMap<>();
static {
ACTIONS_MAP.put(Session.ACTION_ADD_NODE, ADD_NODE);
ACTIONS_MAP.put(JackrabbitSession.ACTION_ADD_PROPERTY, ADD_PROPERTY);
@@ -256,7 +256,7 @@ public final class Permissions {
if (PERMISSION_NAMES.containsKey(permissions)) {
return ImmutableSet.of(PERMISSION_NAMES.get(permissions));
} else {
- Set<String> names = new HashSet<String>();
+ Set<String> names = new HashSet<>();
for (Map.Entry<Long, String> entry : PERMISSION_NAMES.entrySet()) {
long key = entry.getKey();
if ((permissions & key) == key) {
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProvider.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/AbstractRestrictionProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProvider.java
Fri Dec 7 12:39:15 2018
@@ -107,7 +107,7 @@ public abstract class AbstractRestrictio
if (isUnsupportedPath(oakPath)) {
return Collections.emptySet();
} else {
- Set<Restriction> restrictions = new HashSet<Restriction>();
+ Set<Restriction> restrictions = new HashSet<>();
for (PropertyState propertyState :
getRestrictionsTree(aceTree).getProperties()) {
String propName = propertyState.getName();
if (isRestrictionProperty(propName) &&
supported.containsKey(propName)) {
@@ -213,7 +213,7 @@ public abstract class AbstractRestrictio
@NotNull
private Map<String, PropertyState> getRestrictionProperties(Tree aceTree) {
Tree rTree = getRestrictionsTree(aceTree);
- Map<String, PropertyState> restrictionProperties = new HashMap<String,
PropertyState>();
+ Map<String, PropertyState> restrictionProperties = new HashMap<>();
for (PropertyState property : rTree.getProperties()) {
String name = property.getName();
if (isRestrictionProperty(name)) {
