Author: angela
Date: Thu Apr 21 16:23:02 2016
New Revision: 1740349
URL: http://svn.apache.org/viewvc?rev=1740349&view=rev
Log:
OAK-4257 : Findbug issues (patch provided by Alfusainey Jallow)
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandlerTest.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/composite/CompositeAuthorizationConfiguration.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAuthorizationConfigurationTest.java
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandlerTest.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/DefaultSyncHandlerTest.java?rev=1740349&r1=1740348&r2=1740349&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandlerTest.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandlerTest.java
Thu Apr 21 16:23:02 2016
@@ -85,6 +85,8 @@ public class DefaultSyncHandlerTest exte
private void sync(@Nonnull String id, boolean isGroup) throws Exception {
SyncContext ctx = syncHandler.createContext(idp, userManager,
getValueFactory());
ExternalIdentity exIdentity = (isGroup) ? idp.getGroup(id) :
idp.getUser(id);
+ assertNotNull(exIdentity);
+
SyncResult res = ctx.sync(exIdentity);
assertSame(SyncResult.Status.ADD, res.getStatus());
root.commit();
@@ -121,7 +123,9 @@ public class DefaultSyncHandlerTest exte
SyncedIdentity id = syncHandler.findIdentity(userManager, USER_ID);
assertNotNull("known authorizable should exist", id);
- assertEquals("external user should have correct external ref.idp",
idp.getName(), id.getExternalIdRef().getProviderName());
+ ExternalIdentityRef ref = id.getExternalIdRef();
+ assertNotNull(ref);
+ assertEquals("external user should have correct external ref.idp",
idp.getName(), ref.getProviderName());
assertEquals("external user should have correct external ref.id",
USER_ID, id.getExternalIdRef().getId());
}
@@ -148,6 +152,7 @@ public class DefaultSyncHandlerTest exte
root.commit();
SyncedIdentity si = syncHandler.findIdentity(userManager, USER_ID);
+ assertNotNull(si);
assertNull(si.getExternalIdRef());
}
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=1740349&r1=1740348&r2=1740349&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 Apr 21 16:23:02 2016
@@ -61,7 +61,7 @@ final class AuthorizationContext impleme
@Override
public boolean definesTree(@Nonnull Tree tree) {
String ntName = TreeUtil.getPrimaryTypeName(tree);
- return isNtName(ntName);
+ return ntName != null && isNtName(ntName);
}
@Override
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=1740349&r1=1740348&r2=1740349&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 Apr 21 16:23:02 2016
@@ -115,8 +115,9 @@ public class CompositeAuthorizationConfi
default:
List<RestrictionProvider> rps = new
ArrayList<RestrictionProvider>(configurations.size());
for (AuthorizationConfiguration c : configurations) {
- if (RestrictionProvider.EMPTY != c) {
- rps.add(c.getRestrictionProvider());
+ RestrictionProvider rp = c.getRestrictionProvider();
+ if (RestrictionProvider.EMPTY != rp) {
+ rps.add(rp);
}
}
return CompositeRestrictionProvider.newInstance(rps);
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAuthorizationConfigurationTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAuthorizationConfigurationTest.java?rev=1740349&r1=1740348&r2=1740349&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAuthorizationConfigurationTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/authorization/composite/CompositeAuthorizationConfigurationTest.java
Thu Apr 21 16:23:02 2016
@@ -19,6 +19,7 @@ package org.apache.jackrabbit.oak.securi
import java.security.Principal;
import java.util.Collections;
+import javax.annotation.Nonnull;
import javax.jcr.RepositoryException;
import javax.jcr.security.AccessControlManager;
@@ -34,6 +35,7 @@ import org.apache.jackrabbit.oak.spi.sec
import org.junit.Test;
import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotSame;
import static org.junit.Assert.assertSame;
import static org.junit.Assert.assertTrue;
@@ -79,7 +81,7 @@ public class CompositeAuthorizationConfi
}
@Test
- public void testSlingRestrictionProvider() {
+ public void testSingleRestrictionProvider() {
CompositeAuthorizationConfiguration cc = getCompositeConfiguration(new
AuthorizationConfigurationImpl(getSecurityProvider()));
RestrictionProvider rp = cc.getRestrictionProvider();
@@ -136,4 +138,37 @@ public class CompositeAuthorizationConfi
RestrictionProvider rp = cc.getRestrictionProvider();
assertTrue(rp instanceof CompositeRestrictionProvider);
}
+
+ @Test
+ public void testMultipleWithEmptyRestrictionProvider() {
+ CompositeAuthorizationConfiguration cc = getCompositeConfiguration(
+ new AuthorizationConfigurationImpl(getSecurityProvider()),
+ new OpenAuthorizationConfiguration() {
+ @Nonnull
+ @Override
+ public RestrictionProvider getRestrictionProvider() {
+ return RestrictionProvider.EMPTY;
+ }
+ });
+
+ RestrictionProvider rp = cc.getRestrictionProvider();
+ assertFalse(rp instanceof CompositeRestrictionProvider);
+ assertNotSame(RestrictionProvider.EMPTY, rp);
+ }
+
+ @Test
+ public void testOnlyEmptyRestrictionProvider() {
+ AuthorizationConfiguration ac = new OpenAuthorizationConfiguration() {
+ @Nonnull
+ @Override
+ public RestrictionProvider getRestrictionProvider() {
+ return RestrictionProvider.EMPTY;
+ }
+ };
+ CompositeAuthorizationConfiguration cc = getCompositeConfiguration(ac,
ac);
+
+ RestrictionProvider rp = cc.getRestrictionProvider();
+ assertFalse(rp instanceof CompositeRestrictionProvider);
+ assertSame(RestrictionProvider.EMPTY, rp);
+ }
}
\ No newline at end of file
