Author: angela
Date: Thu Dec 6 16:57:35 2018
New Revision: 1848340
URL: http://svn.apache.org/viewvc?rev=1848340&view=rev
Log:
OAK-7944 : Minor improvements to oak security code base
- improve Collections.toArray using empty arrays
Modified:
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/jmx/Delegatee.java
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/DelegateeTest.java
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImplTest.java
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AbstractPrincipalTest.java
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManager.java
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/SupportedPaths.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationContext.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlImporter.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/CompositeAccessControlManager.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositePermissionProvider.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/privilege/PrivilegeManagerImpl.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/UserImporter.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/authentication/AuthInfoImpl.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ACE.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlList.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/restriction/CompositeRestrictionProvider.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/CompositeConfigurationTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/AuthInfoImplTest.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/AbstractRestrictionProviderTest.java
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=1848340&r1=1848339&r2=1848340&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
Thu Dec 6 16:57:35 2018
@@ -744,7 +744,7 @@ public class DefaultSyncContext implemen
values.add(v);
}
}
- return values.toArray(new Value[values.size()]);
+ return values.toArray(new Value[0]);
}
/**
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=1848340&r1=1848339&r2=1848340&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
Thu Dec 6 16:57:35 2018
@@ -151,7 +151,7 @@ final class Delegatee {
results = syncUser(userId, false, results, list);
}
commit(list, results, NO_BATCH_SIZE);
- return list.toArray(new String[list.size()]);
+ return list.toArray(new String[0]);
}
/**
@@ -174,7 +174,7 @@ final class Delegatee {
}
}
commit(list, results, NO_BATCH_SIZE);
- return list.toArray(new String[list.size()]);
+ return list.toArray(new String[0]);
} catch (RepositoryException e) {
throw new IllegalStateException("Error retrieving users for
syncing", e);
}
@@ -211,7 +211,7 @@ final class Delegatee {
}
}
commit(list, results, NO_BATCH_SIZE);
- return list.toArray(new String[list.size()]);
+ return list.toArray(new String[0]);
}
/**
@@ -229,7 +229,7 @@ final class Delegatee {
results = syncUser(user, results, list);
}
commit(list, results, NO_BATCH_SIZE);
- return list.toArray(new String[list.size()]);
+ return list.toArray(new String[0]);
} catch (ExternalIdentityException e) {
throw new SyncRuntimeException("Unable to retrieve external
users", e);
}
@@ -258,7 +258,7 @@ final class Delegatee {
results = syncUser(userId, true, results, list);
}
commit(list, results, NO_BATCH_SIZE);
- return list.toArray(new String[list.size()]);
+ return list.toArray(new String[0]);
}
//------------------------------------------------------------< private
>---
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/DelegateeTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/DelegateeTest.java?rev=1848340&r1=1848339&r2=1848340&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/DelegateeTest.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/DelegateeTest.java
Thu Dec 6 16:57:35 2018
@@ -217,7 +217,7 @@ public class DelegateeTest extends Abstr
for (String id : TEST_IDS) {
externalIds.add(new ExternalIdentityRef(id,
idp.getName()).getString());
}
- String[] result = delegatee.syncExternalUsers(externalIds.toArray(new
String[externalIds.size()]));
+ String[] result = delegatee.syncExternalUsers(externalIds.toArray(new
String[0]));
assertResultMessages(result, ImmutableMap.of(
TestIdentityProvider.ID_TEST_USER, "ERR",
TestIdentityProvider.ID_SECOND_USER, "ERR",
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImplTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImplTest.java?rev=1848340&r1=1848339&r2=1848340&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImplTest.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImplTest.java
Thu Dec 6 16:57:35 2018
@@ -206,7 +206,7 @@ public class SyncMBeanImplTest extends A
syncConfig.group().setExpirationTime(Long.MAX_VALUE);
// force group sync is true by default => exp time is ignored
- String[] result = syncMBean.syncUsers(expected.keySet().toArray(new
String[expected.size()]), false);
+ String[] result = syncMBean.syncUsers(expected.keySet().toArray(new
String[0]), false);
assertResultMessages(result, expected);
}
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AbstractPrincipalTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AbstractPrincipalTest.java?rev=1848340&r1=1848339&r2=1848340&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AbstractPrincipalTest.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/AbstractPrincipalTest.java
Thu Dec 6 16:57:35 2018
@@ -70,7 +70,7 @@ public abstract class AbstractPrincipalT
PrincipalProvider createPrincipalProvider() {
Set<String> autoMembership =
ImmutableSet.copyOf(Iterables.concat(syncConfig.user().getAutoMembership(),syncConfig.group().getAutoMembership()));
return new ExternalGroupPrincipalProvider(root,
getSecurityProvider().getConfiguration(UserConfiguration.class),
- NamePathMapper.DEFAULT, ImmutableMap.of(idp.getName(),
autoMembership.toArray(new String[autoMembership.size()])));
+ NamePathMapper.DEFAULT, ImmutableMap.of(idp.getName(),
autoMembership.toArray(new String[0])));
}
@Override
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManager.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManager.java?rev=1848340&r1=1848339&r2=1848340&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManager.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManager.java
Thu Dec 6 16:57:35 2018
@@ -125,7 +125,7 @@ class CugAccessControlManager extends Ab
}
oakPath = (PathUtils.denotesRoot(oakPath)) ? null :
PathUtils.getAncestorPath(oakPath, 1);
}
- return effective.toArray(new
AccessControlPolicy[effective.size()]);
+ return effective.toArray(new AccessControlPolicy[0]);
} else {
return new AccessControlPolicy[0];
}
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/SupportedPaths.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/SupportedPaths.java?rev=1848340&r1=1848339&r2=1848340&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/SupportedPaths.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/SupportedPaths.java
Thu Dec 6 16:57:35 2018
@@ -28,7 +28,7 @@ class SupportedPaths {
private final boolean includesRootPath;
SupportedPaths(@NotNull Set<String> supportedPaths) {
- this.supportedPaths = supportedPaths.toArray(new
String[supportedPaths.size()]);
+ this.supportedPaths = supportedPaths.toArray(new String[0]);
supportedAltPaths = new String[supportedPaths.size()];
boolean foundRootPath = false;
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationContext.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationContext.java?rev=1848340&r1=1848339&r2=1848340&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationContext.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/AuthorizationContext.java
Thu Dec 6 16:57:35 2018
@@ -28,8 +28,8 @@ import org.jetbrains.annotations.NotNull
final class AuthorizationContext implements Context, AccessControlConstants,
PermissionConstants {
- private static final String[] NODE_NAMES = POLICY_NODE_NAMES.toArray(new
String[POLICY_NODE_NAMES.size()]);
- private static final String[] PROPERTY_NAMES =
ACE_PROPERTY_NAMES.toArray(new String[ACE_PROPERTY_NAMES.size()]);
+ private static final String[] NODE_NAMES = POLICY_NODE_NAMES.toArray(new
String[0]);
+ private static final String[] PROPERTY_NAMES =
ACE_PROPERTY_NAMES.toArray(new String[0]);
private static final String[] NT_NAMES =
Iterables.toArray(Iterables.concat(AC_NODETYPE_NAMES,
PERMISSION_NODETYPE_NAMES), String.class);
private static final Context INSTANCE = new AuthorizationContext();
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlImporter.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlImporter.java?rev=1848340&r1=1848339&r2=1848340&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlImporter.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlImporter.java
Thu Dec 6 16:57:35 2018
@@ -284,7 +284,7 @@ public class AccessControlImporter imple
if (values.size() == 1) {
restrictions.put(propInfo.getName(), values.get(0));
} else {
- mvRestrictions.put(propInfo.getName(), values.toArray(new
Value[values.size()]));
+ mvRestrictions.put(propInfo.getName(), values.toArray(new
Value[0]));
}
}
@@ -297,7 +297,7 @@ public class AccessControlImporter imple
private void applyTo(JackrabbitAccessControlList acl) throws
RepositoryException {
checkNotNull(acl);
if (!ignore) {
- acl.addEntry(principal, privileges.toArray(new
Privilege[privileges.size()]), isAllow, restrictions, mvRestrictions);
+ acl.addEntry(principal, privileges.toArray(new Privilege[0]),
isAllow, restrictions, mvRestrictions);
} else {
log.debug("Unknown principal: Ignore ACE based on
ImportBehavior.IGNORE configuration.");
}
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=1848340&r1=1848339&r2=1848340&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
Thu Dec 6 16:57:35 2018
@@ -142,7 +142,7 @@ public class AccessControlManagerImpl ex
if (readPaths.contains(oakPath)) {
policies.add(ReadPolicy.INSTANCE);
}
- return policies.toArray(new AccessControlPolicy[policies.size()]);
+ return policies.toArray(new AccessControlPolicy[0]);
}
@NotNull
@@ -173,7 +173,7 @@ public class AccessControlManagerImpl ex
if (readPaths.contains(oakPath)) {
effective.add(ReadPolicy.INSTANCE);
}
- return effective.toArray(new AccessControlPolicy[effective.size()]);
+ return effective.toArray(new AccessControlPolicy[0]);
}
@NotNull
@@ -431,7 +431,7 @@ public class AccessControlManagerImpl ex
paths.add(path);
}
}
- return effective.toArray(new AccessControlPolicy[effective.size()]);
+ return effective.toArray(new AccessControlPolicy[0]);
}
//--------------------------------------------------------< PolicyOwner
>---
@@ -763,7 +763,7 @@ public class AccessControlManagerImpl ex
log.warn("Unable to get privilege with name : " + name, e);
}
}
- return privileges.toArray(new Privilege[privileges.size()]);
+ return privileges.toArray(new Privilege[0]);
}
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAccessControlManager.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAccessControlManager.java?rev=1848340&r1=1848339&r2=1848340&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAccessControlManager.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAccessControlManager.java
Thu Dec 6 16:57:35 2018
@@ -68,7 +68,7 @@ class CompositeAccessControlManager exte
privs.add(acMgr.getSupportedPrivileges(absPath));
}
Set<Privilege> s = privs.build();
- return s.toArray(new Privilege[s.size()]);
+ return s.toArray(new Privilege[0]);
}
@Override
@@ -78,7 +78,7 @@ class CompositeAccessControlManager exte
policies.add(acMgr.getPolicies(absPath));
}
List<AccessControlPolicy> l = policies.build();
- return l.toArray(new AccessControlPolicy[l.size()]);
+ return l.toArray(new AccessControlPolicy[0]);
}
@Override
@@ -88,7 +88,7 @@ class CompositeAccessControlManager exte
privs.add(acMgr.getEffectivePolicies(absPath));
}
List<AccessControlPolicy> l = privs.build();
- return l.toArray(new AccessControlPolicy[l.size()]);
+ return l.toArray(new AccessControlPolicy[0]);
}
@Override
@@ -99,7 +99,7 @@ class CompositeAccessControlManager exte
l.add(acMgr.getApplicablePolicies(absPath));
}
}
- return new
AccessControlPolicyIteratorAdapter(Iterators.concat(l.toArray(new
AccessControlPolicyIterator[l.size()])));
+ return new
AccessControlPolicyIteratorAdapter(Iterators.concat(l.toArray(new
AccessControlPolicyIterator[0])));
}
@Override
@@ -134,7 +134,7 @@ class CompositeAccessControlManager exte
}
}
List<JackrabbitAccessControlPolicy> l = policies.build();
- return l.toArray(new JackrabbitAccessControlPolicy[l.size()]);
+ return l.toArray(new JackrabbitAccessControlPolicy[0]);
}
@Override
@@ -146,7 +146,7 @@ class CompositeAccessControlManager exte
}
}
List<JackrabbitAccessControlPolicy> l = privs.build();
- return l.toArray(new JackrabbitAccessControlPolicy[l.size()]);
+ return l.toArray(new JackrabbitAccessControlPolicy[0]);
}
@Override
@@ -158,6 +158,6 @@ class CompositeAccessControlManager exte
}
}
List<AccessControlPolicy> l = privs.build();
- return l.toArray(new AccessControlPolicy[l.size()]);
+ return l.toArray(new AccessControlPolicy[0]);
}
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositePermissionProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositePermissionProvider.java?rev=1848340&r1=1848339&r2=1848340&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositePermissionProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositePermissionProvider.java
Thu Dec 6 16:57:35 2018
@@ -68,7 +68,7 @@ class CompositePermissionProvider implem
@NotNull Context acContext, @NotNull
CompositionType compositionType,
@NotNull RootProvider rootProvider, @NotNull
TreeProvider treeProvider) {
this.root = root;
- this.pps = pps.toArray(new AggregatedPermissionProvider[pps.size()]);
+ this.pps = pps.toArray(new AggregatedPermissionProvider[0]);
this.ctx = acContext;
this.compositionType = compositionType;
this.rootProvider = rootProvider;
@@ -138,7 +138,7 @@ class CompositePermissionProvider implem
Set<String> supportedNames =
privilegeBitsProvider.getPrivilegeNames(supported);
if (compositionType == AND) {
hasPrivileges =
aggregatedPermissionProvider.hasPrivileges(immutableTree,
- supportedNames.toArray(new
String[supportedNames.size()]));
+ supportedNames.toArray(new String[0]));
if (!hasPrivileges) {
return false;
}
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=1848340&r1=1848339&r2=1848340&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
Thu Dec 6 16:57:35 2018
@@ -695,7 +695,7 @@ final class CompiledPermissionImpl imple
private final boolean isDefaultPaths;
private DefaultReadPolicy(Set<String> readPaths) {
- this.readPaths = readPaths.toArray(new String[readPaths.size()]);
+ this.readPaths = readPaths.toArray(new String[0]);
altReadPaths = new String[readPaths.size()];
int i = 0;
for (String p : this.readPaths) {
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImpl.java?rev=1848340&r1=1848339&r2=1848340&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImpl.java
Thu Dec 6 16:57:35 2018
@@ -59,7 +59,7 @@ class PrivilegeManagerImpl implements Pr
for (PrivilegeDefinition def : getPrivilegeDefinitions()) {
privileges.add(getPrivilege(def));
}
- return privileges.toArray(new Privilege[privileges.size()]);
+ return privileges.toArray(new Privilege[0]);
}
@Override
@@ -131,7 +131,7 @@ class PrivilegeManagerImpl implements Pr
@NotNull
private PrivilegeDefinition[] getPrivilegeDefinitions() {
Map<String, PrivilegeDefinition> definitions =
getReader().readDefinitions();
- return definitions.values().toArray(new
PrivilegeDefinition[definitions.size()]);
+ return definitions.values().toArray(new PrivilegeDefinition[0]);
}
@Nullable
@@ -189,7 +189,7 @@ class PrivilegeManagerImpl implements Pr
log.warn("Invalid privilege '{}' in declared aggregates of
'{}'", oakName, getName());
}
}
- return declaredAggregates.toArray(new
Privilege[declaredAggregates.size()]);
+ return declaredAggregates.toArray(new Privilege[0]);
}
@Override
@@ -201,7 +201,7 @@ class PrivilegeManagerImpl implements Pr
aggr.addAll(Arrays.asList(decl.getAggregatePrivileges()));
}
}
- return aggr.toArray(new Privilege[aggr.size()]);
+ return aggr.toArray(new Privilege[0]);
}
//---------------------------------------------------------< Object
>---
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=1848340&r1=1848339&r2=1848340&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
Thu Dec 6 16:57:35 2018
@@ -208,7 +208,7 @@ class PrivilegeValidator extends Default
}
}
- PrivilegeBits aggrBits =
bitsProvider.getBits(declaredNames.toArray(new String[declaredNames.size()]));
+ PrivilegeBits aggrBits =
bitsProvider.getBits(declaredNames.toArray(new String[0]));
if (!newBits.equals(aggrBits)) {
throw new CommitFailedException(CONSTRAINT, 53, "Invalid privilege
bits for aggregated privilege definition.");
}
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=1848340&r1=1848339&r2=1848340&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
Thu Dec 6 16:57:35 2018
@@ -103,7 +103,7 @@ class AuthorizablePropertiesImpl impleme
if (property != null) {
if (property.isArray()) {
List<Value> vs = valueFactory.createValues(property);
- values = vs.toArray(new Value[vs.size()]);
+ values = vs.toArray(new Value[0]);
} else {
values = new Value[]{valueFactory.createValue(property)};
}
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=1848340&r1=1848339&r2=1848340&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
Thu Dec 6 16:57:35 2018
@@ -621,14 +621,14 @@ class UserImporter implements ProtectedP
// 2. adjust members of the group
if (!toRemove.isEmpty()) {
- Set<String> failed =
gr.removeMembers(toRemove.keySet().toArray(new String[toRemove.size()]));
+ Set<String> failed =
gr.removeMembers(toRemove.keySet().toArray(new String[0]));
if (!failed.isEmpty()) {
handleFailure("Failed removing members " +
Iterables.toString(failed) + " to " + gr);
}
}
if (!toAdd.isEmpty()) {
- Set<String> failed = gr.addMembers(toAdd.keySet().toArray(new
String[toAdd.size()]));
+ Set<String> failed = gr.addMembers(toAdd.keySet().toArray(new
String[0]));
if (!failed.isEmpty()) {
handleFailure("Failed add members " +
Iterables.toString(failed) + " to " + gr);
}
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=1848340&r1=1848339&r2=1848340&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
Thu Dec 6 16:57:35 2018
@@ -302,7 +302,7 @@ public abstract class CompositeConfigura
s.add(c);
}
}
- delegatees = (s.isEmpty()) ? null : s.toArray(new
Context[s.size()]);
+ delegatees = (s.isEmpty()) ? null : s.toArray(new Context[0]);
}
private void add(@NotNull SecurityConfiguration configuration) {
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AuthInfoImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AuthInfoImpl.java?rev=1848340&r1=1848339&r2=1848340&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AuthInfoImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AuthInfoImpl.java
Thu Dec 6 16:57:35 2018
@@ -73,7 +73,7 @@ public final class AuthInfoImpl implemen
@NotNull
@Override
public String[] getAttributeNames() {
- return attributes.keySet().toArray(new String[attributes.size()]);
+ return attributes.keySet().toArray(new String[0]);
}
@Override
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ACE.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ACE.java?rev=1848340&r1=1848339&r2=1848340&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ACE.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ACE.java
Thu Dec 6 16:57:35 2018
@@ -129,7 +129,7 @@ public abstract class ACE implements Jac
String jcrName = getJcrName(restriction);
if (jcrName.equals(restrictionName)) {
List<Value> values =
valueFactory.createValues(restriction.getProperty());
- return values.toArray(new Value[values.size()]);
+ return values.toArray(new Value[0]);
}
}
return null;
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlList.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlList.java?rev=1848340&r1=1848339&r2=1848340&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlList.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlList.java
Thu Dec 6 16:57:35 2018
@@ -81,7 +81,7 @@ public abstract class AbstractAccessCont
@Override
public AccessControlEntry[] getAccessControlEntries() {
List<? extends JackrabbitAccessControlEntry> entries = getEntries();
- return entries.toArray(new
JackrabbitAccessControlEntry[entries.size()]);
+ return entries.toArray(new JackrabbitAccessControlEntry[0]);
}
@Override
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=1848340&r1=1848339&r2=1848340&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
Thu Dec 6 16:57:35 2018
@@ -221,7 +221,7 @@ public abstract class AbstractAccessCont
for (String name : pNames) {
privileges.add(privilegeManager.getPrivilege(namePathMapper.getJcrName(name)));
}
- return privileges.toArray(new Privilege[privileges.size()]);
+ return privileges.toArray(new Privilege[0]);
}
}
@@ -246,7 +246,7 @@ public abstract class AbstractAccessCont
for (Privilege privilege : privileges) {
privilegeNames.add(namePathMapper.getOakName(privilege.getName()));
}
- return provider.hasPrivileges(tree, privilegeNames.toArray(new
String[privilegeNames.size()]));
+ return provider.hasPrivileges(tree, privilegeNames.toArray(new
String[0]));
}
}
}
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=1848340&r1=1848339&r2=1848340&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
Thu Dec 6 16:57:35 2018
@@ -44,7 +44,7 @@ public final class CompositeRestrictionP
private final RestrictionProvider[] providers;
private CompositeRestrictionProvider(@NotNull Collection<? extends
RestrictionProvider> providers) {
- this.providers = providers.toArray(new
RestrictionProvider[providers.size()]);
+ this.providers = providers.toArray(new RestrictionProvider[0]);
}
public static RestrictionProvider newInstance(@NotNull
RestrictionProvider... providers) {
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/CompositeConfigurationTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/CompositeConfigurationTest.java?rev=1848340&r1=1848339&r2=1848340&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/CompositeConfigurationTest.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/CompositeConfigurationTest.java
Thu Dec 6 16:57:35 2018
@@ -155,7 +155,7 @@ public class CompositeConfigurationTest
compositeConfiguration.addConfiguration(r200second,
ConfigurationParameters.of(Constants.SERVICE_RANKING, 200));
List l = getConfigurations();
- assertArrayEquals(new SecurityConfiguration[]{r200, r200second, r150,
r100, r50, rUndef}, l.toArray(new SecurityConfiguration[l.size()]));
+ assertArrayEquals(new SecurityConfiguration[]{r200, r200second, r150,
r100, r50, rUndef}, l.toArray(new SecurityConfiguration[0]));
// remove and add new
removeConfiguration(r150);
@@ -166,7 +166,7 @@ public class CompositeConfigurationTest
compositeConfiguration.addConfiguration(r75,
ConfigurationParameters.of(Constants.SERVICE_RANKING, 75));
l = getConfigurations();
- assertArrayEquals(new SecurityConfiguration[]{r200, r200second, r75,
rUndef}, l.toArray(new SecurityConfiguration[l.size()]));
+ assertArrayEquals(new SecurityConfiguration[]{r200, r200second, r75,
rUndef}, l.toArray(new SecurityConfiguration[0]));
}
@Test
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/AuthInfoImplTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/AuthInfoImplTest.java?rev=1848340&r1=1848339&r2=1848340&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/AuthInfoImplTest.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/AuthInfoImplTest.java
Thu Dec 6 16:57:35 2018
@@ -52,7 +52,7 @@ public class AuthInfoImplTest {
@Test
public void testGetAttributeNames() {
String[] attrNames = authInfo.getAttributeNames();
- assertArrayEquals(ATTRIBUTES.keySet().toArray(new
String[ATTRIBUTES.size()]), attrNames);
+ assertArrayEquals(ATTRIBUTES.keySet().toArray(new String[0]),
attrNames);
}
@Test
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=1848340&r1=1848339&r2=1848340&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
Thu Dec 6 16:57:35 2018
@@ -350,7 +350,7 @@ public class PermissionsTest {
TreeLocation tl = TreeLocation.create(existingTree);
long permissions =
Permissions.NODE_TYPE_MANAGEMENT|Permissions.LOCK_MANAGEMENT|Permissions.VERSION_MANAGEMENT;
Set<String> names = Permissions.getNames(permissions);
- String jcrActions = Text.implode(names.toArray(new
String[names.size()]), ",");
+ String jcrActions = Text.implode(names.toArray(new String[0]), ",");
assertEquals(permissions, Permissions.getPermissions(jcrActions, tl,
false));
}
Modified:
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProviderTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProviderTest.java?rev=1848340&r1=1848339&r2=1848340&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProviderTest.java
(original)
+++
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProviderTest.java
Thu Dec 6 16:57:35 2018
@@ -222,7 +222,7 @@ public class AbstractRestrictionProvider
assertEquals(Type.NAMES, ps.getType());
List<Value> vs = valueFactory.createValues(ps);
- assertArrayEquals(nameValues, vs.toArray(new Value[vs.size()]));
+ assertArrayEquals(nameValues, vs.toArray(new Value[0]));
}
@Test
@@ -237,7 +237,7 @@ public class AbstractRestrictionProvider
assertEquals(Type.NAMES, ps.getType());
List<Value> vs = valueFactory.createValues(ps);
- assertArrayEquals(nameValues, vs.toArray(new Value[vs.size()]));
+ assertArrayEquals(nameValues, vs.toArray(new Value[0]));
}
@Test
@@ -251,7 +251,7 @@ public class AbstractRestrictionProvider
assertEquals(Type.NAMES, r.getProperty().getType());
List<Value> vs = valueFactory.createValues(r.getProperty());
- assertArrayEquals(new Value[] {nameValue}, vs.toArray(new
Value[vs.size()]));
+ assertArrayEquals(new Value[] {nameValue}, vs.toArray(new Value[0]));
}
@Test
