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 2016/05/17 09:58:37 UTC
svn commit: r1744235 - in /jackrabbit/oak/trunk:
oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/
oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/
oak-core/src/main/java/org/apache/j...
Author: angela
Date: Tue May 17 09:58:37 2016
New Revision: 1744235
URL: http://svn.apache.org/viewvc?rev=1744235&view=rev
Log:
minor improvement: fix order of modifiers, simplify nested if statement in IdentifierManager
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugTreePermission.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManager.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeTreePermission.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProvider.java
Modified: jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugTreePermission.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/CugTreePermission.java?rev=1744235&r1=1744234&r2=1744235&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugTreePermission.java (original)
+++ jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugTreePermission.java Tue May 17 09:58:37 2016
@@ -133,7 +133,7 @@ final class CugTreePermission extends Ab
}
//--------------------------------------------------------------------------
- private final static class Status {
+ private static final class Status {
private static final Status FALSE = new Status(false, false, false);
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManager.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManager.java?rev=1744235&r1=1744234&r2=1744235&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManager.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/plugins/identifier/IdentifierManager.java Tue May 17 09:58:37 2016
@@ -259,10 +259,8 @@ public class IdentifierManager {
}
} else {
Type<?> type = (weak) ? Type.WEAKREFERENCE : Type.REFERENCE;
- if (pState.getType() == type) {
- if (uuid.equals(pState.getValue(Type.STRING))) {
- return PathUtils.concat(rowPath, pState.getName());
- }
+ if (pState.getType() == type && uuid.equals(pState.getValue(Type.STRING))) {
+ return PathUtils.concat(rowPath, pState.getName());
}
}
return null;
@@ -303,7 +301,7 @@ public class IdentifierManager {
* specified {@code tree} and matching the constraints.
*/
@Nonnull
- public Iterable<String> getReferences(@Nonnull Tree tree, final @Nonnull String propertyName,
+ public Iterable<String> getReferences(@Nonnull Tree tree, @Nonnull final String propertyName,
@Nonnull String ntName, boolean weak) {
if (!nodeTypeManager.isNodeType(tree, JcrConstants.MIX_REFERENCEABLE)) {
return Collections.emptySet(); // shortcut
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeTreePermission.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeTreePermission.java?rev=1744235&r1=1744234&r2=1744235&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeTreePermission.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeTreePermission.java Tue May 17 09:58:37 2016
@@ -122,7 +122,7 @@ final class CompositeTreePermission impl
//-----------------------------------------------------< TreePermission >---
@Nonnull
@Override
- public TreePermission getChildPermission(final @Nonnull String childName, final @Nonnull NodeState childState) {
+ public TreePermission getChildPermission(@Nonnull final String childName, @Nonnull final NodeState childState) {
return create(new LazyTree() {
@Override
ImmutableTree get() {
Modified: jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProvider.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProvider.java?rev=1744235&r1=1744234&r2=1744235&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProvider.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProvider.java Tue May 17 09:58:37 2016
@@ -123,7 +123,7 @@ public final class PrivilegeBitsProvider
* @return the privilege bits
*/
@Nonnull
- public PrivilegeBits getBits(@Nonnull Privilege[] privileges, final @Nonnull NameMapper nameMapper) {
+ public PrivilegeBits getBits(@Nonnull Privilege[] privileges, @Nonnull final NameMapper nameMapper) {
return getBits(Iterables.filter(Iterables.transform(Arrays.asList(privileges), new Function<Privilege, String>() {
@Override