You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by an...@apache.org on 2017/05/09 09:10:59 UTC
svn commit: r1794510 -
/jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/
Author: angela
Date: Tue May 9 09:10:58 2017
New Revision: 1794510
URL: http://svn.apache.org/viewvc?rev=1794510&view=rev
Log:
minor improvement: simplify and typos
Modified:
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/CugConfiguration.java
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugImporter.java
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPolicyImpl.java
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugValidatorProvider.java
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/NestedCugHook.java
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=1794510&r1=1794509&r2=1794510&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 Tue May 9 09:10:58 2017
@@ -30,7 +30,6 @@ import javax.jcr.security.AccessControlP
import javax.jcr.security.AccessControlPolicyIterator;
import javax.jcr.security.Privilege;
-import com.google.common.base.Function;
import com.google.common.collect.ImmutableSet;
import com.google.common.collect.Iterables;
import com.google.common.collect.Sets;
@@ -112,7 +111,7 @@ class CugAccessControlManager extends Ab
boolean enabled = config.getConfigValue(CugConstants.PARAM_CUG_ENABLED, false);
if (enabled) {
Root r = getRoot().getContentSession().getLatestRoot();
- List<AccessControlPolicy> effective = new ArrayList<AccessControlPolicy>();
+ List<AccessControlPolicy> effective = new ArrayList<>();
while (oakPath != null) {
if (isSupportedPath(oakPath)) {
CugPolicy cug = getCugPolicy(oakPath, r.getTree(oakPath));
@@ -254,16 +253,13 @@ class CugAccessControlManager extends Ab
if (property == null) {
return Collections.emptySet();
} else {
- return ImmutableSet.copyOf(Iterables.transform(property.getValue(Type.STRINGS), new Function<String, Principal>() {
- @Override
- public Principal apply(String principalName) {
- Principal principal = principalManager.getPrincipal(principalName);
- if (principal == null) {
- log.debug("Unknown principal " + principalName);
- principal = new PrincipalImpl(principalName);
- }
- return principal;
+ return ImmutableSet.copyOf(Iterables.transform(property.getValue(Type.STRINGS), principalName -> {
+ Principal principal = principalManager.getPrincipal(principalName);
+ if (principal == null) {
+ log.debug("Unknown principal " + principalName);
+ principal = new PrincipalImpl(principalName);
}
+ return principal;
}));
}
}
Modified: jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfiguration.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/CugConfiguration.java?rev=1794510&r1=1794509&r2=1794510&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfiguration.java (original)
+++ jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfiguration.java Tue May 9 09:10:58 2017
@@ -66,7 +66,6 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.authorization.permission.PermissionProvider;
import org.apache.jackrabbit.oak.spi.security.authorization.restriction.RestrictionProvider;
import org.apache.jackrabbit.oak.spi.state.ApplyDiff;
-import org.apache.jackrabbit.oak.spi.state.NodeBuilder;
import org.apache.jackrabbit.oak.spi.state.NodeState;
import org.apache.jackrabbit.oak.spi.state.NodeStore;
import org.apache.jackrabbit.oak.spi.xml.ProtectedItemImporter;
@@ -142,19 +141,16 @@ public class CugConfiguration extends Co
@Nonnull
@Override
public RepositoryInitializer getRepositoryInitializer() {
- return new RepositoryInitializer() {
- @Override
- public void initialize(@Nonnull NodeBuilder builder) {
- NodeState base = builder.getNodeState();
- NodeStore store = new MemoryNodeStore(base);
-
- Root root = RootFactory.createSystemRoot(store,
- new EditorHook(new CompositeEditorProvider(new NamespaceEditorProvider(), new TypeEditorProvider())),
- null, null, null, null);
- if (registerCugNodeTypes(root)) {
- NodeState target = store.getRoot();
- target.compareAgainstBaseState(base, new ApplyDiff(builder));
- }
+ return builder -> {
+ NodeState base = builder.getNodeState();
+ NodeStore store = new MemoryNodeStore(base);
+
+ Root root = RootFactory.createSystemRoot(store,
+ new EditorHook(new CompositeEditorProvider(new NamespaceEditorProvider(), new TypeEditorProvider())),
+ null, null, null, null);
+ if (registerCugNodeTypes(root)) {
+ NodeState target = store.getRoot();
+ target.compareAgainstBaseState(base, new ApplyDiff(builder));
}
};
}
@@ -205,17 +201,12 @@ public class CugConfiguration extends Co
}
};
if (!ntMgr.hasNodeType(NT_REP_CUG_POLICY)) {
- InputStream stream = CugConfiguration.class.getResourceAsStream("cug_nodetypes.cnd");
- try {
+ try (InputStream stream = CugConfiguration.class.getResourceAsStream("cug_nodetypes.cnd")) {
NodeTypeRegistry.register(root, stream, "cug node types");
return true;
- } finally {
- stream.close();
}
}
- } catch (IOException e) {
- throw new IllegalStateException("Unable to read cug node types", e);
- } catch (RepositoryException e) {
+ } catch (IOException | RepositoryException e) {
throw new IllegalStateException("Unable to read cug node types", e);
}
return false;
Modified: jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugImporter.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/CugImporter.java?rev=1794510&r1=1794509&r2=1794510&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugImporter.java (original)
+++ jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugImporter.java Tue May 9 09:10:58 2017
@@ -90,7 +90,7 @@ class CugImporter implements ProtectedPr
@Override
public boolean handlePropInfo(@Nonnull Tree parent, @Nonnull PropInfo protectedPropInfo, @Nonnull PropertyDefinition def) throws RepositoryException {
if (CugUtil.definesCug(parent) && isValid(protectedPropInfo, def) && CugUtil.isSupportedPath(parent.getPath(), config)) {
- Set<String> principalNames = new HashSet<String>();
+ Set<String> principalNames = new HashSet<>();
for (TextValue txtValue : protectedPropInfo.getTextValues()) {
String principalName = txtValue.getString();
Principal principal = principalManager.getPrincipal(principalName);
Modified: jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPolicyImpl.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/CugPolicyImpl.java?rev=1794510&r1=1794509&r2=1794510&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPolicyImpl.java (original)
+++ jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPolicyImpl.java Tue May 9 09:10:58 2017
@@ -24,7 +24,6 @@ import javax.annotation.CheckForNull;
import javax.annotation.Nonnull;
import javax.jcr.security.AccessControlException;
-import com.google.common.base.Function;
import com.google.common.base.Strings;
import com.google.common.collect.Iterables;
import com.google.common.collect.Sets;
@@ -48,7 +47,7 @@ class CugPolicyImpl implements CugPolicy
private final PrincipalManager principalManager;
private final int importBehavior;
- private final Set<Principal> principals = new HashSet<Principal>();
+ private final Set<Principal> principals = new HashSet<>();
CugPolicyImpl(@Nonnull String oakPath, @Nonnull NamePathMapper namePathMapper,
@Nonnull PrincipalManager principalManager, int importBehavior) {
@@ -102,12 +101,7 @@ class CugPolicyImpl implements CugPolicy
//--------------------------------------------------------------------------
Iterable<String> getPrincipalNames() {
- return Iterables.transform(principals, new Function<Principal, String>() {
- @Override
- public String apply(Principal principal) {
- return principal.getName();
- }
- });
+ return Iterables.transform(principals, Principal::getName);
}
//--------------------------------------------------------------------------
Modified: jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugValidatorProvider.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/CugValidatorProvider.java?rev=1794510&r1=1794509&r2=1794510&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugValidatorProvider.java (original)
+++ jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugValidatorProvider.java Tue May 9 09:10:58 2017
@@ -71,7 +71,7 @@ class CugValidatorProvider extends Valid
private final String parentName;
private final boolean isNodetypeTree;
- private CugValidator(@Nonnull String parentName, @Nonnull NodeState parentAfter, @Nonnull boolean isNodetypeTree) {
+ private CugValidator(@Nonnull String parentName, @Nonnull NodeState parentAfter, boolean isNodetypeTree) {
this.parentAfter = parentAfter;
this.parentName = parentName;
this.isNodetypeTree = isNodetypeTree;
Modified: jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/NestedCugHook.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/NestedCugHook.java?rev=1794510&r1=1794509&r2=1794510&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/NestedCugHook.java (original)
+++ jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/NestedCugHook.java Tue May 9 09:10:58 2017
@@ -80,7 +80,7 @@ class NestedCugHook implements PostValid
private static long addNestedCugPath(@Nonnull NodeBuilder parentBuilder, @Nonnull NodeBuilder builder, @Nonnull String pathWithNewCug) {
PropertyState ps = parentBuilder.getProperty(HIDDEN_NESTED_CUGS);
- PropertyBuilder pb = getHiddenPropertyBuilder(ps);
+ PropertyBuilder<String> pb = getHiddenPropertyBuilder(ps);
if (ps != null) {
List<String> moveToNestedCug = Lists.newArrayList();
for (String p : ps.getValue(Type.STRINGS)) {
@@ -94,7 +94,7 @@ class NestedCugHook implements PostValid
}
}
if (!moveToNestedCug.isEmpty()) {
- PropertyBuilder pb2 = getHiddenPropertyBuilder(builder.getProperty(HIDDEN_NESTED_CUGS));
+ PropertyBuilder<String> pb2 = getHiddenPropertyBuilder(builder.getProperty(HIDDEN_NESTED_CUGS));
pb2.addValues(moveToNestedCug);
builder.setProperty(pb2.getPropertyState());
}
@@ -108,7 +108,7 @@ class NestedCugHook implements PostValid
private static int removeNestedCugPath(@Nonnull NodeBuilder parentBuilder, @Nonnull String toRemove, @Nonnull Iterable<String> toReconnect) {
PropertyState ps = parentBuilder.getProperty(HIDDEN_NESTED_CUGS);
- PropertyBuilder pb = getHiddenPropertyBuilder(ps);
+ PropertyBuilder<String> pb = getHiddenPropertyBuilder(ps);
if (pb.hasValue(toRemove)) {
pb.removeValue(toRemove);
pb.addValues(toReconnect);
@@ -125,7 +125,7 @@ class NestedCugHook implements PostValid
}
}
- private static PropertyBuilder getHiddenPropertyBuilder(@Nullable PropertyState ps) {
+ private static PropertyBuilder<String> getHiddenPropertyBuilder(@Nullable PropertyState ps) {
return PropertyBuilder.copy(Type.STRING, ps).setName(HIDDEN_NESTED_CUGS).setArray();
}
@@ -210,7 +210,7 @@ class NestedCugHook implements PostValid
if (!NodeStateUtils.isHidden(name)) {
if (CugUtil.definesCug(name, before)) {
deletedCUGs.add(path);
- // reconnect information about nested cugs at a parent if
+ // reconnect information about nested CUGs at a parent if
// only the CUG got removed but the whole subtree including CUGs
// are still present.
Set<String> reconnect = Sets.newHashSet();