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 2015/03/26 19:20:34 UTC
svn commit: r1669399 - in
/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization:
accesscontrol/ composite/ permission/ restriction/
Author: angela
Date: Thu Mar 26 18:20:33 2015
New Revision: 1669399
URL: http://svn.apache.org/r1669399
Log:
OAK-2674 : Fix FindBug Issues
Modified:
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/composite/CompositeAuthorizationConfiguration.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/PermissionHook.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/restriction/RestrictionProviderImpl.java
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=1669399&r1=1669398&r2=1669399&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 Mar 26 18:20:33 2015
@@ -235,13 +235,13 @@ public class AccessControlImporter imple
//--------------------------------------------------------------------------
private final class MutableEntry {
- final boolean isAllow;
+ private final boolean isAllow;
- Principal principal;
- List<Privilege> privileges;
- Map<String, Value> restrictions = new HashMap<String, Value>();
+ private Principal principal;
+ private List<Privilege> privileges;
+ private Map<String, Value> restrictions = new HashMap<String, Value>();
- boolean ignore;
+ private boolean ignore;
private MutableEntry(boolean isAllow) {
this.isAllow = isAllow;
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=1669399&r1=1669398&r2=1669399&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 Thu Mar 26 18:20:33 2015
@@ -48,8 +48,8 @@ public class CompositeAuthorizationConfi
@Nonnull
@Override
- public AccessControlManager getAccessControlManager(final @Nonnull Root root,
- final @Nonnull NamePathMapper namePathMapper) {
+ public AccessControlManager getAccessControlManager(@Nonnull final Root root,
+ @Nonnull final NamePathMapper namePathMapper) {
List<AuthorizationConfiguration> configurations = getConfigurations();
switch (configurations.size()) {
case 0: throw new IllegalStateException();
@@ -81,9 +81,9 @@ public class CompositeAuthorizationConfi
@Nonnull
@Override
- public PermissionProvider getPermissionProvider(final @Nonnull Root root,
- final @Nonnull String workspaceName,
- final @Nonnull Set<Principal> principals) {
+ public PermissionProvider getPermissionProvider(@Nonnull final Root root,
+ @Nonnull final String workspaceName,
+ @Nonnull final Set<Principal> principals) {
List<AuthorizationConfiguration> configurations = getConfigurations();
switch (configurations.size()) {
case 0: throw new IllegalStateException();
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=1669399&r1=1669398&r2=1669399&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 Mar 26 18:20:33 2015
@@ -80,7 +80,7 @@ class CompositePermissionProvider implem
}
@Override
- public Set<String> getPrivileges(final @Nullable Tree tree) {
+ public Set<String> getPrivileges(@Nullable final Tree tree) {
PrivilegeBits result = null;
Iterable<AggregatedPermissionProvider> providers = Iterables.filter(pps, new Predicate<AggregatedPermissionProvider>() {
@Override
@@ -102,7 +102,7 @@ class CompositePermissionProvider implem
}
@Override
- public boolean hasPrivileges(final @Nullable Tree tree, @Nonnull String... privilegeNames) {
+ public boolean hasPrivileges(@Nullable final Tree tree, @Nonnull String... privilegeNames) {
for (final String privName : pbp.getAggregatedPrivilegeNames(privilegeNames)) {
Iterable<AggregatedPermissionProvider> providers = Iterables.filter(pps, new Predicate<AggregatedPermissionProvider>() {
@Override
@@ -138,7 +138,7 @@ class CompositePermissionProvider implem
}
@Override
- public boolean isGranted(final @Nonnull Tree parent, @Nullable PropertyState property, final long permissions) {
+ public boolean isGranted(@Nonnull final Tree parent, @Nullable PropertyState property, final long permissions) {
if (Permissions.isAggregate(permissions)) {
for (final long permission : Permissions.aggregates(permissions)) {
Iterable<AggregatedPermissionProvider> providers = Iterables.filter(pps, new Predicate<AggregatedPermissionProvider>() {
@@ -164,7 +164,7 @@ class CompositePermissionProvider implem
}
@Override
- public boolean isGranted(final @Nonnull String oakPath, @Nonnull String jcrActions) {
+ public boolean isGranted(@Nonnull final String oakPath, @Nonnull String jcrActions) {
final String[] actions = Text.explode(jcrActions, ',', false);
switch (actions.length) {
case 0: return true;
@@ -254,7 +254,7 @@ class CompositePermissionProvider implem
map = ImmutableMap.of();
}
- private CompositeTreePermission(final @Nonnull ImmutableTree tree, @Nonnull CompositeTreePermission parentPermission) {
+ private CompositeTreePermission(@Nonnull final ImmutableTree tree, @Nonnull CompositeTreePermission parentPermission) {
this.tree = tree;
this.parentPermission = parentPermission;
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=1669399&r1=1669398&r2=1669399&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 Thu Mar 26 18:20:33 2015
@@ -120,7 +120,7 @@ public class PermissionHook implements P
return rootBuilder.getChildNode(JCR_SYSTEM).getChildNode(REP_PERMISSION_STORE).getChildNode(workspaceName);
}
- private class Diff extends DefaultNodeStateDiff {
+ private final class Diff extends DefaultNodeStateDiff {
private final String parentPath;
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=1669399&r1=1669398&r2=1669399&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 Thu Mar 26 18:20:33 2015
@@ -62,6 +62,8 @@ public class RestrictionProviderImpl ext
private static final Logger log = LoggerFactory.getLogger(RestrictionProviderImpl.class);
+ private static final int NUMBER_OF_DEFINITIONS = 3;
+
public RestrictionProviderImpl() {
super(supportedRestrictions());
}
@@ -80,7 +82,7 @@ public class RestrictionProviderImpl ext
if (oakPath == null) {
return RestrictionPattern.EMPTY;
} else {
- List<RestrictionPattern> patterns = new ArrayList<RestrictionPattern>(3);
+ List<RestrictionPattern> patterns = new ArrayList<RestrictionPattern>(NUMBER_OF_DEFINITIONS);
PropertyState glob = tree.getProperty(REP_GLOB);
if (glob != null) {
patterns.add(GlobPattern.create(oakPath, glob.getValue(Type.STRING)));
@@ -103,7 +105,7 @@ public class RestrictionProviderImpl ext
if (oakPath == null || restrictions.isEmpty()) {
return RestrictionPattern.EMPTY;
} else {
- List<RestrictionPattern> patterns = new ArrayList<RestrictionPattern>(3);
+ List<RestrictionPattern> patterns = new ArrayList<RestrictionPattern>(NUMBER_OF_DEFINITIONS);
for (Restriction r : restrictions) {
String name = r.getDefinition().getName();
if (REP_GLOB.equals(name)) {