Author: angela
Date: Fri Dec 7 08:41:05 2018
New Revision: 1848385
URL: http://svn.apache.org/viewvc?rev=1848385&view=rev
Log:
OAK-7944 : Minor improvements to oak security code base
- improvements to collection loops
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/AbstractJmxTest.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/permission/PermissionStoreEditor.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/PrincipalRestrictionProvider.java
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/AbstractJmxTest.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/AbstractJmxTest.java?rev=1848385&r1=1848384&r2=1848385&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/AbstractJmxTest.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/AbstractJmxTest.java
Fri Dec 7 08:41:05 2018
@@ -55,8 +55,7 @@ public abstract class AbstractJmxTest ex
static void assertResultMessages(@NotNull String[] resultMessages,
@NotNull Map<String, String> expected) {
assertEquals(expected.size(), resultMessages.length);
- for (int i = 0; i < resultMessages.length; i++) {
- String rm = resultMessages[i];
+ for (String rm : resultMessages) {
String op = rm.substring(rm.indexOf(":") + 2, rm.indexOf("\","));
int index = rm.indexOf("uid:\"") + 5;
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=1848385&r1=1848384&r2=1848385&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 08:41:05 2018
@@ -272,13 +272,7 @@ public class AccessControlManagerImpl ex
// the node-based policy (see above for adding entries without
// this special restriction).
Set<Restriction> rstr = Sets.newHashSet(ace.getRestrictions());
- Iterator<Restriction> it = rstr.iterator();
- while (it.hasNext()) {
- Restriction r = it.next();
- if (REP_NODE_PATH.equals(r.getDefinition().getName())) {
- it.remove();
- }
- }
+ rstr.removeIf(r ->
REP_NODE_PATH.equals(r.getDefinition().getName()));
acl.removeAccessControlEntry(new Entry(ace.getPrincipal(),
ace.getPrivilegeBits(), ace.isAllow(), rstr, getNamePathMapper()));
setNodeBasedAcl(path, tree, acl);
} else {
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreEditor.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreEditor.java?rev=1848385&r1=1848384&r2=1848385&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreEditor.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionStoreEditor.java
Fri Dec 7 08:41:05 2018
@@ -89,11 +89,7 @@ final class PermissionStoreEditor implem
AcEntry entry = (privilegeBits.equals(jcrAll)) ?
new JcrAllAcEntry(ace, accessControlledPath, index,
isAllow, privilegeBits, restrictions) :
new AcEntry(ace, accessControlledPath, index, isAllow,
privilegeBits, restrictions);
- List<AcEntry> list = entries.get(entry.principalName);
- if (list == null) {
- list = new ArrayList<>();
- entries.put(entry.principalName, list);
- }
+ List<AcEntry> list =
entries.computeIfAbsent(entry.principalName, k -> new ArrayList<>());
list.add(entry);
index++;
}
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=1848385&r1=1848384&r2=1848385&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 08:41:05 2018
@@ -17,7 +17,6 @@
package org.apache.jackrabbit.oak.security.authorization.restriction;
import java.util.HashSet;
-import java.util.Iterator;
import java.util.Set;
import javax.jcr.PropertyType;
import javax.jcr.RepositoryException;
@@ -89,13 +88,7 @@ public class PrincipalRestrictionProvide
@Override
public void writeRestrictions(String oakPath, Tree aceTree,
Set<Restriction> restrictions) throws RepositoryException {
- Iterator<Restriction> it = Sets.newHashSet(restrictions).iterator();
- while (it.hasNext()) {
- Restriction r = it.next();
- if (REP_NODE_PATH.equals(r.getDefinition().getName())) {
- it.remove();
- }
- }
+ Sets.newHashSet(restrictions).removeIf(r ->
REP_NODE_PATH.equals(r.getDefinition().getName()));
base.writeRestrictions(oakPath, aceTree, restrictions);
}
