Author: angela
Date: Thu Dec 6 15:55:56 2018
New Revision: 1848335
URL: http://svn.apache.org/viewvc?rev=1848335&view=rev
Log:
OAK-7944 : Minor improvements to oak security code base
- clean up redundant throws clauses
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/SyncHandler.java
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandler.java
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.java
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/TestIdentityProvider.java
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandlerTest.java
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleFactoryTest.java
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImplTest.java
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProviderTest.java
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityImporterTest.java
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityRepositoryInitializerTest.java
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityValidatorTest.java
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfigurationTest.java
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/PrincipalProviderDeepNestingTest.java
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ValidatorNotDynamicTest.java
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/CugImporter.java
jackrabbit/oak/trunk/oak-authorization-cug/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/NestedCugHook.java
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManagerTest.java
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfigurationTest.java
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugContextTest.java
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugEvaluationTest.java
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugImporterTest.java
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPermissionProviderTest.java
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugTreePermissionTest.java
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugUtilTest.java
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/EmptyCugTreePermissionTest.java
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/TopLevelPathTest.java
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/VersionTest.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/CallbackHandlerImpl.java
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/accesscontrol/AccessControlValidator.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/permission/PermissionValidator.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/JcrAllCommitHook.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidator.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableBaseProvider.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/GroupImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/ImpersonationImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/MembershipProvider.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/MembershipWriter.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImporter.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserManagerImpl.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserValidator.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/autosave/AutoSaveEnabledManager.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/Condition.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/ConditionVisitor.java
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/query/XPathConditionVisitor.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModule.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ACE.java
jackrabbit/oak/trunk/oak-security-spi/src/main/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlList.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/CompositeConfigurationTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/CompositeContextTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/ConfigurationParametersTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/AbstractLoginModuleTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/GuestLoginModuleTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/token/CompositeTokenConfigurationTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ACETest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlListTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/AbstractAccessControlManagerTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/ImmutableACLTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/accesscontrol/TestACL.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/AbstractRestrictionProviderTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/CompositeRestrictionProviderTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionDefinitionImplTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/restriction/RestrictionImplTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/CompositePrincipalConfigurationTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/principal/EmptyPrincipalProviderTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/privilege/PrivilegeBitsProviderTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/AuthorizableTypeTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/ClearMembershipActionTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/PasswordValidationActionTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/security/user/util/PasswordUtilTest.java
jackrabbit/oak/trunk/oak-security-spi/src/test/java/org/apache/jackrabbit/oak/spi/xml/PropInfoTest.java
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/SyncHandler.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/SyncHandler.java?rev=1848335&r1=1848334&r2=1848335&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/SyncHandler.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/SyncHandler.java
Thu Dec 6 15:55:56 2018
@@ -57,7 +57,7 @@ public interface SyncHandler {
@NotNull
SyncContext createContext(@NotNull ExternalIdentityProvider idp,
@NotNull UserManager userManager,
- @NotNull ValueFactory valueFactory) throws
SyncException;
+ @NotNull ValueFactory valueFactory);
/**
* Tries to find the identity with the given authorizable id or name.
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandler.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandler.java?rev=1848335&r1=1848334&r2=1848335&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandler.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/DefaultSyncHandler.java
Thu Dec 6 15:55:56 2018
@@ -31,7 +31,6 @@ import org.apache.jackrabbit.commons.ite
import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
import
org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalIdentityProvider;
import
org.apache.jackrabbit.oak.spi.security.authentication.external.SyncContext;
-import
org.apache.jackrabbit.oak.spi.security.authentication.external.SyncException;
import
org.apache.jackrabbit.oak.spi.security.authentication.external.SyncHandler;
import
org.apache.jackrabbit.oak.spi.security.authentication.external.SyncedIdentity;
import
org.apache.jackrabbit.oak.spi.security.authentication.external.basic.DefaultSyncConfig;
@@ -101,7 +100,7 @@ public class DefaultSyncHandler implemen
@NotNull
@Override
public SyncContext createContext(@NotNull ExternalIdentityProvider idp,
@NotNull UserManager userManager,
- @NotNull ValueFactory valueFactory)
throws SyncException {
+ @NotNull ValueFactory valueFactory) {
if (config.user().getDynamicMembership()) {
return new DynamicSyncContext(config, idp, userManager,
valueFactory);
} else {
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java?rev=1848335&r1=1848334&r2=1848335&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModule.java
Thu Dec 6 15:55:56 2018
@@ -259,7 +259,7 @@ public class ExternalLoginModule extends
}
@Override
- public boolean commit() throws LoginException {
+ public boolean commit() {
if (externalUser == null) {
// login attempt in this login module was not successful
clearState();
@@ -283,7 +283,7 @@ public class ExternalLoginModule extends
}
@Override
- public boolean abort() throws LoginException {
+ public boolean abort() {
clearState();
// do we need to remove the user again, in case we created it during
login() ?
return true;
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.java?rev=1848335&r1=1848334&r2=1848335&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/main/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/Delegatee.java
Thu Dec 6 15:55:56 2018
@@ -81,7 +81,7 @@ final class Delegatee {
private SyncContext context;
private Delegatee(@NotNull SyncHandler handler, @NotNull
ExternalIdentityProvider idp,
- @NotNull ContentSession systemSession, @NotNull
SecurityProvider securityProvider, int batchSize) throws SyncException {
+ @NotNull ContentSession systemSession, @NotNull
SecurityProvider securityProvider, int batchSize) {
this.handler = handler;
this.idp = idp;
@@ -117,12 +117,7 @@ final class Delegatee {
throw new SyncRuntimeException(ERROR_CREATE_DELEGATEE, e);
}
- try {
- return new Delegatee(handler, idp, systemSession,
securityProvider, batchSize);
- } catch (SyncException e) {
- close(systemSession);
- throw new SyncRuntimeException(ERROR_CREATE_DELEGATEE, e);
- }
+ return new Delegatee(handler, idp, systemSession, securityProvider,
batchSize);
}
private static void close(@NotNull ContentSession systemSession) {
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/TestIdentityProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/TestIdentityProvider.java?rev=1848335&r1=1848334&r2=1848335&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/TestIdentityProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/TestIdentityProvider.java
Thu Dec 6 15:55:56 2018
@@ -148,7 +148,7 @@ public class TestIdentityProvider implem
@NotNull
@Override
- public Iterator<ExternalGroup> listGroups() throws
ExternalIdentityException {
+ public Iterator<ExternalGroup> listGroups() {
return externalGroups.values().iterator();
}
@@ -249,7 +249,7 @@ public class TestIdentityProvider implem
@NotNull
@Override
- public Iterable<ExternalIdentityRef> getDeclaredMembers() throws
ExternalIdentityException {
+ public Iterable<ExternalIdentityRef> getDeclaredMembers() {
return null;
}
}
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=1848335&r1=1848334&r2=1848335&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 Dec 6 15:55:56 2018
@@ -98,7 +98,7 @@ public class DefaultSyncHandlerTest exte
}
@Test
- public void testCreateContext() throws Exception {
+ public void testCreateContext() {
SyncContext ctx = syncHandler.createContext(idp, userManager,
getValueFactory());
assertTrue(ctx instanceof DefaultSyncContext);
}
@@ -202,7 +202,7 @@ public class DefaultSyncHandlerTest exte
}
@Test
- public void testRequiresSyncMissingExternalIDRef() throws Exception {
+ public void testRequiresSyncMissingExternalIDRef() {
assertTrue(syncHandler.requiresSync(new DefaultSyncedIdentity(USER_ID,
null, false, Long.MAX_VALUE)));
}
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleFactoryTest.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/ExternalLoginModuleFactoryTest.java?rev=1848335&r1=1848334&r2=1848335&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleFactoryTest.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/ExternalLoginModuleFactoryTest.java
Thu Dec 6 15:55:56 2018
@@ -102,7 +102,7 @@ public class ExternalLoginModuleFactoryT
* Prepares the OSGi part with required services injected and configures
* the factory in JAAS options which then delegates to
ExternalLoginModuleFactory
*/
- private void setUpJaasFactoryWithInjection() throws Exception{
+ private void setUpJaasFactoryWithInjection() {
context.registerService(Repository.class,
EasyMock.createMock(Repository.class));
context.registerService(SyncManager.class, new
SyncManagerImpl(whiteboard));
context.registerService(ExternalIdentityProviderManager.class, new
ExternalIDPManagerImpl(whiteboard));
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImplTest.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/SyncMBeanImplTest.java?rev=1848335&r1=1848334&r2=1848335&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImplTest.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/jmx/SyncMBeanImplTest.java
Thu Dec 6 15:55:56 2018
@@ -401,7 +401,7 @@ public class SyncMBeanImplTest extends A
}
@Test
- public void testSyncExternalNonExisting() throws Exception {
+ public void testSyncExternalNonExisting() {
ExternalIdentityRef ref = new ExternalIdentityRef("nonExisting",
idp.getName());
String[] result = syncMBean.syncExternalUsers(new
String[]{ref.getString()});
@@ -412,7 +412,7 @@ public class SyncMBeanImplTest extends A
* @see <a
href="https://issues.apache.org/jira/browse/OAK-4346";>OAK-4346</a>
*/
@Test
- public void testSyncExternalLocal() throws Exception {
+ public void testSyncExternalLocal() {
ExternalIdentityRef ref = new
ExternalIdentityRef(UserConstants.DEFAULT_ANONYMOUS_ID, null);
String[] result = syncMBean.syncExternalUsers(new
String[]{ref.getString()});
@@ -423,7 +423,7 @@ public class SyncMBeanImplTest extends A
* @see <a
href="https://issues.apache.org/jira/browse/OAK-4346";>OAK-4346</a>
*/
@Test
- public void testSyncExternalForeign() throws Exception {
+ public void testSyncExternalForeign() {
ExternalIdentityRef ref = new
ExternalIdentityRef(TestIdentityProvider.ID_TEST_USER, "anotherIDP");
String[] result = syncMBean.syncExternalUsers(new
String[]{ref.getString()});
@@ -434,14 +434,14 @@ public class SyncMBeanImplTest extends A
}
@Test
- public void testSyncExternalUserException() throws Exception {
+ public void testSyncExternalUserException() {
ExternalIdentityRef ref = new
ExternalIdentityRef(TestIdentityProvider.ID_EXCEPTION, idp.getName());
String[] result = syncMBean.syncExternalUsers(new String[]
{ref.getString()});
assertResultMessages(result, TestIdentityProvider.ID_EXCEPTION, "ERR");
}
@Test
- public void testSyncExternalUserThrowingHandler() throws Exception {
+ public void testSyncExternalUserThrowingHandler() {
ExternalIdentityRef ref = new
ExternalIdentityRef(TestIdentityProvider.ID_TEST_USER, idp.getName());
String[] result = createThrowingSyncMBean(false).syncExternalUsers(new
String[]{ref.getString()});
assertResultMessages(result, TestIdentityProvider.ID_TEST_USER, "ERR");
@@ -451,7 +451,7 @@ public class SyncMBeanImplTest extends A
* test users have never been synced before => result must be empty
*/
@Test
- public void testSyncAllUsersBefore() throws Exception {
+ public void testSyncAllUsersBefore() {
String[] result = syncMBean.syncAllUsers(false);
assertEquals(0, result.length);
}
@@ -570,7 +570,7 @@ public class SyncMBeanImplTest extends A
}
@Test(expected = IllegalStateException.class)
- public void testSyncAllUsersThrowingHandler() throws Exception {
+ public void testSyncAllUsersThrowingHandler() {
String[] result = createThrowingSyncMBean(false).syncAllUsers(false);
}
@@ -771,7 +771,7 @@ public class SyncMBeanImplTest extends A
@NotNull
@Override
- public SyncContext createContext(@NotNull ExternalIdentityProvider
idp, @NotNull UserManager userManager, @NotNull ValueFactory valueFactory)
throws SyncException {
+ public SyncContext createContext(@NotNull ExternalIdentityProvider
idp, @NotNull UserManager userManager, @NotNull ValueFactory valueFactory) {
return new DefaultSyncContext(syncConfig, idp, userManager,
valueFactory) {
@NotNull
@Override
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProviderTest.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/principal/ExternalGroupPrincipalProviderTest.java?rev=1848335&r1=1848334&r2=1848335&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProviderTest.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalGroupPrincipalProviderTest.java
Thu Dec 6 15:55:56 2018
@@ -315,7 +315,7 @@ public class ExternalGroupPrincipalProvi
}
@Test
- public void testFindPrincipalsByHintTypeGroup() throws Exception {
+ public void testFindPrincipalsByHintTypeGroup() {
Set<? extends Principal> expected = ImmutableSet.of(new
PrincipalImpl("a"));
Set<? extends Principal> res =
ImmutableSet.copyOf(principalProvider.findPrincipals("a",
PrincipalManager.SEARCH_TYPE_GROUP));
@@ -323,7 +323,7 @@ public class ExternalGroupPrincipalProvi
}
@Test
- public void testFindPrincipalsByHintTypeAll() throws Exception {
+ public void testFindPrincipalsByHintTypeAll() {
Set<? extends Principal> expected = ImmutableSet.of(new
PrincipalImpl("a"));
Set<? extends Principal> res =
ImmutableSet.copyOf(principalProvider.findPrincipals("a",
PrincipalManager.SEARCH_TYPE_ALL));
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityImporterTest.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/principal/ExternalIdentityImporterTest.java?rev=1848335&r1=1848334&r2=1848335&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityImporterTest.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityImporterTest.java
Thu Dec 6 15:55:56 2018
@@ -69,7 +69,7 @@ public class ExternalIdentityImporterTes
" <sv:property sv:name=\"rep:lastSynced\"
sv:type=\"Date\"><sv:value>2016-05-03T10:03:08.061+02:00</sv:value></sv:property>"
+
"</sv:node>";
- private Repository createRepo() throws Exception {
+ private Repository createRepo() {
SecurityProvider securityProvider =
TestSecurityProvider.newTestSecurityProvider(ConfigurationParameters.EMPTY,
new ExternalPrincipalConfiguration());
QueryEngineSettings queryEngineSettings = new QueryEngineSettings();
@@ -81,7 +81,7 @@ public class ExternalIdentityImporterTes
return jcr.createRepository();
}
- private static void shutdown(Repository repo) throws Exception {
+ private static void shutdown(Repository repo) {
if (repo != null && repo instanceof JackrabbitRepository) {
((JackrabbitRepository) repo).shutdown();
}
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityRepositoryInitializerTest.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/principal/ExternalIdentityRepositoryInitializerTest.java?rev=1848335&r1=1848334&r2=1848335&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityRepositoryInitializerTest.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityRepositoryInitializerTest.java
Thu Dec 6 15:55:56 2018
@@ -32,7 +32,7 @@ import static org.junit.Assert.assertTru
public class ExternalIdentityRepositoryInitializerTest extends
AbstractExternalAuthTest {
@Test
- public void testExternalIdIndexDefinition() throws Exception {
+ public void testExternalIdIndexDefinition() {
Tree oakIndex = root.getTree('/' +
IndexConstants.INDEX_DEFINITIONS_NAME);
assertTrue(oakIndex.exists());
@@ -41,7 +41,7 @@ public class ExternalIdentityRepositoryI
}
@Test
- public void testPrincipalNamesIndexDefinition() throws Exception {
+ public void testPrincipalNamesIndexDefinition() {
Tree oakIndex = root.getTree('/' +
IndexConstants.INDEX_DEFINITIONS_NAME);
assertTrue(oakIndex.exists());
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityValidatorTest.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/principal/ExternalIdentityValidatorTest.java?rev=1848335&r1=1848334&r2=1848335&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityValidatorTest.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalIdentityValidatorTest.java
Thu Dec 6 15:55:56 2018
@@ -72,7 +72,7 @@ public class ExternalIdentityValidatorTe
}
@Test
- public void testAddExternalPrincipalNames() throws Exception {
+ public void testAddExternalPrincipalNames() {
Tree userTree = root.getTree(testUserPath);
NodeUtil userNode = new NodeUtil(userTree);
try {
@@ -302,7 +302,7 @@ public class ExternalIdentityValidatorTe
}
@Test
- public void testRemoveRepExternalId() throws Exception {
+ public void testRemoveRepExternalId() {
try {
root.getTree(externalUserPath).removeProperty(ExternalIdentityConstants.REP_EXTERNAL_ID);
root.commit();
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfigurationTest.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/principal/ExternalPrincipalConfigurationTest.java?rev=1848335&r1=1848334&r2=1848335&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfigurationTest.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ExternalPrincipalConfigurationTest.java
Thu Dec 6 15:55:56 2018
@@ -22,7 +22,6 @@ import java.util.Hashtable;
import java.util.Iterator;
import java.util.List;
import java.util.Map;
-import javax.jcr.RepositoryException;
import javax.jcr.ValueFactory;
import com.google.common.collect.ImmutableMap;
@@ -37,7 +36,6 @@ import org.apache.jackrabbit.oak.spi.sec
import
org.apache.jackrabbit.oak.spi.security.authentication.external.AbstractExternalAuthTest;
import
org.apache.jackrabbit.oak.spi.security.authentication.external.ExternalIdentityProvider;
import
org.apache.jackrabbit.oak.spi.security.authentication.external.SyncContext;
-import
org.apache.jackrabbit.oak.spi.security.authentication.external.SyncException;
import
org.apache.jackrabbit.oak.spi.security.authentication.external.SyncHandler;
import
org.apache.jackrabbit.oak.spi.security.authentication.external.SyncedIdentity;
import
org.apache.jackrabbit.oak.spi.security.authentication.external.basic.DefaultSyncConfig;
@@ -66,7 +64,7 @@ public class ExternalPrincipalConfigurat
context.registerService(SyncHandler.class, new DefaultSyncHandler(),
ImmutableMap.<String,
Object>of(DefaultSyncConfigImpl.PARAM_USER_DYNAMIC_MEMBERSHIP, true));
}
- private void assertIsEnabled(ExternalPrincipalConfiguration
externalPrincipalConfiguration, boolean expected) throws Exception {
+ private void assertIsEnabled(ExternalPrincipalConfiguration
externalPrincipalConfiguration, boolean expected) {
PrincipalProvider pp =
externalPrincipalConfiguration.getPrincipalProvider(root, getNamePathMapper());
assertEquals(expected, pp instanceof ExternalGroupPrincipalProvider);
}
@@ -83,7 +81,7 @@ public class ExternalPrincipalConfigurat
}
@Test
- public void testGetPrincipalProvider() throws Exception {
+ public void testGetPrincipalProvider() {
PrincipalProvider pp =
externalPrincipalConfiguration.getPrincipalProvider(root,
NamePathMapper.DEFAULT);
assertNotNull(pp);
assertFalse(pp instanceof ExternalGroupPrincipalProvider);
@@ -153,7 +151,7 @@ public class ExternalPrincipalConfigurat
}
@Test
- public void testGetValidatorsOmitIdProtection() throws Exception {
+ public void testGetValidatorsOmitIdProtection() {
externalPrincipalConfiguration.setParameters(ConfigurationParameters.of(ExternalIdentityConstants.PARAM_PROTECT_EXTERNAL_IDS,
false));
ContentSession cs = root.getContentSession();
@@ -187,7 +185,7 @@ public class ExternalPrincipalConfigurat
}
@Test
- public void testAddingSyncHandler() throws Exception {
+ public void testAddingSyncHandler() {
Map<String, Object> enableProps = ImmutableMap.<String,
Object>of(DefaultSyncConfigImpl.PARAM_USER_DYNAMIC_MEMBERSHIP, true);
Map<String, Object> disableProps = ImmutableMap.<String,
Object>of(DefaultSyncConfigImpl.PARAM_USER_DYNAMIC_MEMBERSHIP, false);
@@ -206,7 +204,7 @@ public class ExternalPrincipalConfigurat
}
@Test
- public void testAddingCustomSyncHandler() throws Exception {
+ public void testAddingCustomSyncHandler() {
Map<String, Object> enableProps = ImmutableMap.<String,
Object>of(DefaultSyncConfigImpl.PARAM_USER_DYNAMIC_MEMBERSHIP, true);
SyncHandler sh = new TestSyncHandler();
@@ -219,7 +217,7 @@ public class ExternalPrincipalConfigurat
@Ignore("TODO: mock doesn't reflect property-changes on the registration.")
@Test
- public void testModifySyncHandler() throws Exception {
+ public void testModifySyncHandler() {
Dictionary<String, Object> enableProps = new
Hashtable(ImmutableMap.<String,
Object>of(DefaultSyncConfigImpl.PARAM_USER_DYNAMIC_MEMBERSHIP, true));
Dictionary<String, Object> disableProps = new
Hashtable(ImmutableMap.<String,
Object>of(DefaultSyncConfigImpl.PARAM_USER_DYNAMIC_MEMBERSHIP, false));
@@ -237,7 +235,7 @@ public class ExternalPrincipalConfigurat
}
@Test
- public void testRemoveSyncHandler() throws Exception {
+ public void testRemoveSyncHandler() {
Dictionary<String, Object> enableProps = new
Hashtable(ImmutableMap.<String,
Object>of(DefaultSyncConfigImpl.PARAM_USER_DYNAMIC_MEMBERSHIP, true));
Dictionary<String, Object> disableProps = new
Hashtable(ImmutableMap.<String,
Object>of(DefaultSyncConfigImpl.PARAM_USER_DYNAMIC_MEMBERSHIP, false));
@@ -270,12 +268,12 @@ public class ExternalPrincipalConfigurat
@NotNull
@Override
- public SyncContext createContext(@NotNull ExternalIdentityProvider
idp, @NotNull UserManager userManager, @NotNull ValueFactory valueFactory)
throws SyncException {
+ public SyncContext createContext(@NotNull ExternalIdentityProvider
idp, @NotNull UserManager userManager, @NotNull ValueFactory valueFactory) {
return new DefaultSyncContext(new DefaultSyncConfig(), idp,
userManager, valueFactory);
}
@Override
- public SyncedIdentity findIdentity(@NotNull UserManager userManager,
@NotNull String id) throws RepositoryException {
+ public SyncedIdentity findIdentity(@NotNull UserManager userManager,
@NotNull String id) {
return null;
}
@@ -286,7 +284,7 @@ public class ExternalPrincipalConfigurat
@NotNull
@Override
- public Iterator<SyncedIdentity> listIdentities(@NotNull UserManager
userManager) throws RepositoryException {
+ public Iterator<SyncedIdentity> listIdentities(@NotNull UserManager
userManager) {
return Collections.emptyIterator();
}
}
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/PrincipalProviderDeepNestingTest.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/principal/PrincipalProviderDeepNestingTest.java?rev=1848335&r1=1848334&r2=1848335&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/PrincipalProviderDeepNestingTest.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/PrincipalProviderDeepNestingTest.java
Thu Dec 6 15:55:56 2018
@@ -82,7 +82,7 @@ public class PrincipalProviderDeepNestin
@Override
@Test
- public void testFindPrincipalsByHintTypeGroup() throws Exception {
+ public void testFindPrincipalsByHintTypeGroup() {
Set<? extends Principal> expected = ImmutableSet.of(new
PrincipalImpl("a"), new PrincipalImpl("aa"), new PrincipalImpl("aaa"));
Set<? extends Principal> res =
ImmutableSet.copyOf(principalProvider.findPrincipals("a",
PrincipalManager.SEARCH_TYPE_GROUP));
@@ -91,7 +91,7 @@ public class PrincipalProviderDeepNestin
@Override
@Test
- public void testFindPrincipalsByHintTypeAll() throws Exception {
+ public void testFindPrincipalsByHintTypeAll() {
Set<? extends Principal> expected = ImmutableSet.of(
new PrincipalImpl("a"),
new PrincipalImpl("aa"),
Modified:
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ValidatorNotDynamicTest.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/principal/ValidatorNotDynamicTest.java?rev=1848335&r1=1848334&r2=1848335&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ValidatorNotDynamicTest.java
(original)
+++
jackrabbit/oak/trunk/oak-auth-external/src/test/java/org/apache/jackrabbit/oak/spi/security/authentication/external/impl/principal/ValidatorNotDynamicTest.java
Thu Dec 6 15:55:56 2018
@@ -83,7 +83,7 @@ public class ValidatorNotDynamicTest ext
@Override
@Test
- public void testRemoveRepExternalId() throws Exception {
+ public void testRemoveRepExternalId() {
try {
root.getTree(externalUserPath).removeProperty(ExternalIdentityConstants.REP_EXTERNAL_ID);
root.commit();
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=1848335&r1=1848334&r2=1848335&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
Thu Dec 6 15:55:56 2018
@@ -201,19 +201,19 @@ class CugAccessControlManager extends Ab
//-------------------------------------< JackrabbitAccessControlManager
>---
@Override
- public JackrabbitAccessControlPolicy[] getApplicablePolicies(Principal
principal) throws RepositoryException {
+ public JackrabbitAccessControlPolicy[] getApplicablePolicies(Principal
principal) {
// editing by 'principal' is not supported
return new JackrabbitAccessControlPolicy[0];
}
@Override
- public JackrabbitAccessControlPolicy[] getPolicies(Principal principal)
throws RepositoryException {
+ public JackrabbitAccessControlPolicy[] getPolicies(Principal principal) {
// editing by 'principal' is not supported
return new JackrabbitAccessControlPolicy[0];
}
@Override
- public AccessControlPolicy[] getEffectivePolicies(Set<Principal>
principals) throws RepositoryException {
+ public AccessControlPolicy[] getEffectivePolicies(Set<Principal>
principals) {
// editing by 'principal' is not supported
return new AccessControlPolicy[0];
}
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=1848335&r1=1848334&r2=1848335&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
Thu Dec 6 15:55:56 2018
@@ -89,14 +89,14 @@ class CugImporter implements ProtectedPr
}
@Override
- public void processReferences() throws RepositoryException {
+ public void processReferences() {
// nothing to do
}
//------------------------------------------< ProtectedPropertyImporter
>---
@Override
- public boolean handlePropInfo(@NotNull Tree parent, @NotNull PropInfo
protectedPropInfo, @NotNull PropertyDefinition def) throws RepositoryException {
+ public boolean handlePropInfo(@NotNull Tree parent, @NotNull PropInfo
protectedPropInfo, @NotNull PropertyDefinition def) {
if (CugUtil.definesCug(parent) && isValid(protectedPropInfo, def) &&
CugUtil.isSupportedPath(parent.getPath(), supportedPaths)) {
Set<String> principalNames = new HashSet<>();
for (TextValue txtValue : protectedPropInfo.getTextValues()) {
@@ -128,7 +128,7 @@ class CugImporter implements ProtectedPr
}
@Override
- public void propertiesCompleted(@NotNull Tree protectedParent) throws
IllegalStateException, RepositoryException {
+ public void propertiesCompleted(@NotNull Tree protectedParent) throws
IllegalStateException {
if (CugUtil.definesCug(protectedParent) &&
!protectedParent.hasProperty(REP_PRINCIPAL_NAMES)) {
// remove the rep:cugPolicy node if mandatory property is missing
// (which may also happen upon an attempt to create a cug at an
unsupported path).
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=1848335&r1=1848334&r2=1848335&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
Thu Dec 6 15:55:56 2018
@@ -21,7 +21,6 @@ import java.util.Set;
import com.google.common.collect.Iterables;
import com.google.common.collect.Lists;
import com.google.common.collect.Sets;
-import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.commons.PathUtils;
@@ -62,7 +61,7 @@ class NestedCugHook implements PostValid
//-------------------------------------------------< PostValidationHook
>---
@NotNull
@Override
- public NodeState processCommit(NodeState before, NodeState after,
CommitInfo info) throws CommitFailedException {
+ public NodeState processCommit(NodeState before, NodeState after,
CommitInfo info) {
NodeBuilder builder = after.builder();
after.compareAgainstBaseState(before, new Diff(before, builder));
deletedCUGs.clear();
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManagerTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManagerTest.java?rev=1848335&r1=1848334&r2=1848335&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManagerTest.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugAccessControlManagerTest.java
Thu Dec 6 15:55:56 2018
@@ -399,21 +399,21 @@ public class CugAccessControlManagerTest
}
@Test
- public void testGetApplicablePoliciesByPrincipal() throws Exception {
+ public void testGetApplicablePoliciesByPrincipal() {
AccessControlPolicy[] applicable =
cugAccessControlManager.getApplicablePolicies(EveryonePrincipal.getInstance());
assertNotNull(applicable);
assertEquals(0, applicable.length);
}
@Test
- public void testGetPoliciesByPrincipal() throws Exception {
+ public void testGetPoliciesByPrincipal() {
AccessControlPolicy[] applicable =
cugAccessControlManager.getPolicies(EveryonePrincipal.getInstance());
assertNotNull(applicable);
assertEquals(0, applicable.length);
}
@Test
- public void testGetEffectivePoliciesByPrincipal() throws Exception {
+ public void testGetEffectivePoliciesByPrincipal() {
AccessControlPolicy[] applicable =
cugAccessControlManager.getEffectivePolicies(ImmutableSet.<Principal>of(EveryonePrincipal.getInstance()));
assertNotNull(applicable);
assertEquals(0, applicable.length);
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfigurationTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfigurationTest.java?rev=1848335&r1=1848334&r2=1848335&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfigurationTest.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugConfigurationTest.java
Thu Dec 6 15:55:56 2018
@@ -199,7 +199,7 @@ public class CugConfigurationTest extend
}
@Test
- public void testActivate() throws Exception {
+ public void testActivate() {
CugConfiguration cugConfiguration =
createConfiguration(ConfigurationParameters.EMPTY);
cugConfiguration.activate(ImmutableMap.of(
CugConstants.PARAM_CUG_ENABLED, false,
@@ -209,7 +209,7 @@ public class CugConfigurationTest extend
}
@Test
- public void testModified() throws Exception {
+ public void testModified() {
CugConfiguration cugConfiguration =
createConfiguration(ConfigurationParameters.EMPTY);
cugConfiguration.modified(ImmutableMap.of(
CugConstants.PARAM_CUG_SUPPORTED_PATHS, new
String[]{"/changed"}
@@ -217,7 +217,7 @@ public class CugConfigurationTest extend
assertSupportedPaths(cugConfiguration, "/changed");
}
- private static void assertSupportedPaths(@NotNull CugConfiguration
configuration, @NotNull String... paths) throws Exception {
+ private static void assertSupportedPaths(@NotNull CugConfiguration
configuration, @NotNull String... paths) {
Set<String> expected = ImmutableSet.copyOf(paths);
assertEquals(expected,
configuration.getParameters().getConfigValue(CugConstants.PARAM_CUG_SUPPORTED_PATHS,
ImmutableSet.of()));
}
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugContextTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugContextTest.java?rev=1848335&r1=1848334&r2=1848335&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugContextTest.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugContextTest.java
Thu Dec 6 15:55:56 2018
@@ -17,7 +17,6 @@
package org.apache.jackrabbit.oak.spi.security.authorization.cug.impl;
import java.util.List;
-import javax.jcr.AccessDeniedException;
import javax.jcr.security.AccessControlList;
import javax.jcr.security.AccessControlManager;
@@ -113,7 +112,7 @@ public class CugContextTest extends Abst
}
@Test
- public void testDefinesLocation() throws AccessDeniedException {
+ public void testDefinesLocation() {
assertTrue(CugContext.INSTANCE.definesLocation(TreeLocation.create(root,
CUG_PATH)));
assertTrue(CugContext.INSTANCE.definesLocation(TreeLocation.create(root,
CUG_PATH + "/" + CugConstants.REP_PRINCIPAL_NAMES)));
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugEvaluationTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugEvaluationTest.java?rev=1848335&r1=1848334&r2=1848335&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugEvaluationTest.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugEvaluationTest.java
Thu Dec 6 15:55:56 2018
@@ -104,7 +104,7 @@ public class CugEvaluationTest extends A
}
@Test
- public void testRead() throws Exception {
+ public void testRead() {
List<String> noAccess = ImmutableList.of(
"/", UNSUPPORTED_PATH, /* no access */
"/content/a", "/content/a/b", "/content/aa/bb", /* granted by
ace, denied by cug */
@@ -121,7 +121,7 @@ public class CugEvaluationTest extends A
}
@Test
- public void testReadAcl() throws Exception {
+ public void testReadAcl() {
assertFalse(testRoot.getTree("/content/rep:policy").exists());
}
@@ -138,7 +138,7 @@ public class CugEvaluationTest extends A
}
@Test
- public void testReadCug() throws Exception {
+ public void testReadCug() {
List<String> noAccess = ImmutableList.of(
"/content/a/rep:cugPolicy", "/content/aa/bb/rep:cugPolicy",
"/content2/rep:cugPolicy"
);
@@ -233,7 +233,7 @@ public class CugEvaluationTest extends A
}
@Test
- public void testIsGrantedTestGroup() throws Exception {
+ public void testIsGrantedTestGroup() {
// testGroup
PermissionProvider pp = createPermissionProvider(testGroupPrincipal);
@@ -247,7 +247,7 @@ public class CugEvaluationTest extends A
}
@Test
- public void testIsGrantedEveryone() throws Exception {
+ public void testIsGrantedEveryone() {
// everyone
PermissionProvider pp =
createPermissionProvider(EveryonePrincipal.getInstance());
@@ -263,7 +263,7 @@ public class CugEvaluationTest extends A
}
@Test
- public void testIsGrantedTestGroupEveryone() throws Exception {
+ public void testIsGrantedTestGroupEveryone() {
// testGroup + everyone
PermissionProvider pp = createPermissionProvider(testGroupPrincipal,
EveryonePrincipal.getInstance());
@@ -291,7 +291,7 @@ public class CugEvaluationTest extends A
}
@Test
- public void testHasPrivilegesTestGroup() throws Exception {
+ public void testHasPrivilegesTestGroup() {
// testGroup
PermissionProvider pp = createPermissionProvider(testGroupPrincipal);
@@ -305,7 +305,7 @@ public class CugEvaluationTest extends A
}
@Test
- public void testHasPrivilegesEveryone() throws Exception {
+ public void testHasPrivilegesEveryone() {
// everyone
PermissionProvider pp =
createPermissionProvider(EveryonePrincipal.getInstance());
@@ -321,7 +321,7 @@ public class CugEvaluationTest extends A
}
@Test
- public void testHasPrivilegesTestGroupEveryone() throws Exception {
+ public void testHasPrivilegesTestGroupEveryone() {
// testGroup + everyone
PermissionProvider pp = createPermissionProvider(testGroupPrincipal,
EveryonePrincipal.getInstance());
@@ -349,7 +349,7 @@ public class CugEvaluationTest extends A
}
@Test
- public void testHasAllPrivileges() throws Exception {
+ public void testHasAllPrivileges() {
// testGroup
PermissionProvider pp = createPermissionProvider(testGroupPrincipal);
@@ -376,7 +376,7 @@ public class CugEvaluationTest extends A
}
@Test
- public void testHasAllPrivilegesAdmin() throws Exception {
+ public void testHasAllPrivilegesAdmin() {
PermissionProvider pp = createPermissionProvider(adminSession);
assertTrue(pp.hasPrivileges(content, PrivilegeConstants.JCR_ALL));
@@ -385,7 +385,7 @@ public class CugEvaluationTest extends A
}
@Test
- public void testGetPrivilegesTestGroup() throws Exception {
+ public void testGetPrivilegesTestGroup() {
Set<String> w_rac = ImmutableSet.of(PrivilegeConstants.REP_WRITE,
PrivilegeConstants.JCR_READ_ACCESS_CONTROL);
Set<String> r_w_rac = ImmutableSet.of(PrivilegeConstants.JCR_READ,
PrivilegeConstants.REP_WRITE, PrivilegeConstants.JCR_READ_ACCESS_CONTROL);
@@ -399,7 +399,7 @@ public class CugEvaluationTest extends A
}
@Test
- public void testGetPrivilegesEveryone() throws Exception {
+ public void testGetPrivilegesEveryone() {
// everyone
PermissionProvider pp =
createPermissionProvider(EveryonePrincipal.getInstance());
@@ -410,7 +410,7 @@ public class CugEvaluationTest extends A
}
@Test
- public void testGetPrivilegesTestGroupEveryone() throws Exception {
+ public void testGetPrivilegesTestGroupEveryone() {
Set<String> r_w_rac = ImmutableSet.of(PrivilegeConstants.JCR_READ,
PrivilegeConstants.REP_WRITE, PrivilegeConstants.JCR_READ_ACCESS_CONTROL);
// testGroup + everyone
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugImporterTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugImporterTest.java?rev=1848335&r1=1848334&r2=1848335&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugImporterTest.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugImporterTest.java
Thu Dec 6 15:55:56 2018
@@ -47,7 +47,7 @@ public class CugImporterTest extends Abs
}
@Test(expected = IllegalStateException.class)
- public void testInitTwice() throws Exception {
+ public void testInitTwice() {
Session session = Mockito.mock(Session.class);
assertTrue(importer.init(session, root, getNamePathMapper(), true,
ImportUUIDBehavior.IMPORT_UUID_CREATE_NEW, new ReferenceChangeTracker(),
getSecurityProvider()));
importer.init(session, root, getNamePathMapper(), true,
ImportUUIDBehavior.IMPORT_UUID_CREATE_NEW, new ReferenceChangeTracker(),
getSecurityProvider());
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPermissionProviderTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPermissionProviderTest.java?rev=1848335&r1=1848334&r2=1848335&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPermissionProviderTest.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugPermissionProviderTest.java
Thu Dec 6 15:55:56 2018
@@ -323,7 +323,7 @@ public class CugPermissionProviderTest e
* @see
org.apache.jackrabbit.oak.spi.security.authorization.permission.AggregatedPermissionProvider#isGranted(org.apache.jackrabbit.oak.plugins.tree.TreeLocation,
long)
*/
@Test
- public void testIsGrantedByLocation() throws Exception {
+ public void testIsGrantedByLocation() {
for (String p : NOT_READABLE_PATHS) {
TreeLocation location = TreeLocation.create(root, p);
assertFalse(cugPermProvider.isGranted(location, Permissions.READ));
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugTreePermissionTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugTreePermissionTest.java?rev=1848335&r1=1848334&r2=1848335&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugTreePermissionTest.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugTreePermissionTest.java
Thu Dec 6 15:55:56 2018
@@ -23,7 +23,6 @@ import org.apache.jackrabbit.oak.api.Tre
import org.apache.jackrabbit.oak.commons.PathUtils;
import org.apache.jackrabbit.oak.plugins.memory.PropertyStates;
import org.apache.jackrabbit.oak.plugins.tree.TreeProvider;
-import org.apache.jackrabbit.oak.plugins.tree.impl.AbstractTree;
import
org.apache.jackrabbit.oak.spi.security.authorization.permission.Permissions;
import
org.apache.jackrabbit.oak.spi.security.authorization.permission.TreePermission;
import org.apache.jackrabbit.oak.spi.security.principal.EveryonePrincipal;
@@ -64,7 +63,7 @@ public class CugTreePermissionTest exten
}
@Test
- public void testGetChildPermission() throws Exception {
+ public void testGetChildPermission() {
TreeProvider treeProvider = getTreeProvider();
NodeState ns = treeProvider.asNodeState(root.getTree(SUPPORTED_PATH +
"/subtree"));
TreePermission child = allowedTp.getChildPermission("subtree", ns);
@@ -79,7 +78,7 @@ public class CugTreePermissionTest exten
}
@Test
- public void testIsAllow() throws Exception {
+ public void testIsAllow() {
assertTrue(allowedTp.isAllow());
assertFalse(deniedTp.isAllow());
}
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugUtilTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugUtilTest.java?rev=1848335&r1=1848334&r2=1848335&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugUtilTest.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/CugUtilTest.java
Thu Dec 6 15:55:56 2018
@@ -20,9 +20,7 @@ import java.util.Set;
import com.google.common.collect.ImmutableSet;
import org.apache.jackrabbit.oak.api.Tree;
import org.apache.jackrabbit.oak.commons.PathUtils;
-import org.apache.jackrabbit.oak.plugins.tree.TreeProvider;
import org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants;
-import org.apache.jackrabbit.oak.plugins.tree.impl.AbstractTree;
import org.apache.jackrabbit.oak.spi.mount.MountInfoProvider;
import org.apache.jackrabbit.oak.spi.mount.Mounts;
import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/EmptyCugTreePermissionTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/EmptyCugTreePermissionTest.java?rev=1848335&r1=1848334&r2=1848335&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/EmptyCugTreePermissionTest.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/EmptyCugTreePermissionTest.java
Thu Dec 6 15:55:56 2018
@@ -24,7 +24,6 @@ import org.apache.jackrabbit.oak.api.Tre
import org.apache.jackrabbit.oak.plugins.memory.PropertyStates;
import org.apache.jackrabbit.oak.spi.nodetype.NodeTypeConstants;
import org.apache.jackrabbit.oak.plugins.tree.TreeType;
-import org.apache.jackrabbit.oak.plugins.tree.impl.AbstractTree;
import org.apache.jackrabbit.oak.spi.version.VersionConstants;
import
org.apache.jackrabbit.oak.spi.security.authorization.permission.Permissions;
import
org.apache.jackrabbit.oak.spi.security.authorization.permission.TreePermission;
@@ -60,7 +59,7 @@ public class EmptyCugTreePermissionTest
}
@Test
- public void testRootPermission() throws Exception {
+ public void testRootPermission() {
assertCugPermission(tp, false);
TreePermission rootTp = pp.getTreePermission(root.getTree("/"),
TreePermission.EMPTY);
@@ -68,7 +67,7 @@ public class EmptyCugTreePermissionTest
}
@Test
- public void testJcrSystemPermissions() throws Exception {
+ public void testJcrSystemPermissions() {
NodeState system = rootState.getChildNode(JcrConstants.JCR_SYSTEM);
TreePermission systemTp =
tp.getChildPermission(JcrConstants.JCR_SYSTEM, system);
assertCugPermission(systemTp, false);
@@ -85,7 +84,7 @@ public class EmptyCugTreePermissionTest
}
@Test
- public void testGetChildPermission() throws Exception {
+ public void testGetChildPermission() {
String name = Text.getName(SUPPORTED_PATH2);
NodeState ns = rootState.getChildNode(name);
TreePermission child = tp.getChildPermission(name, ns);
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/TopLevelPathTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/TopLevelPathTest.java?rev=1848335&r1=1848334&r2=1848335&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/TopLevelPathTest.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/TopLevelPathTest.java
Thu Dec 6 15:55:56 2018
@@ -59,7 +59,7 @@ public class TopLevelPathTest extends Ab
}
@Test
- public void testContainsNoCug() throws Exception {
+ public void testContainsNoCug() {
TopLevelPaths tlp = new
TopLevelPaths(getRootProvider().createReadOnlyRoot(root));
for (String p : PATHS) {
assertFalse(tlp.contains(p));
Modified:
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/VersionTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/VersionTest.java?rev=1848335&r1=1848334&r2=1848335&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/VersionTest.java
(original)
+++
jackrabbit/oak/trunk/oak-authorization-cug/src/test/java/org/apache/jackrabbit/oak/spi/security/authorization/cug/impl/VersionTest.java
Thu Dec 6 15:55:56 2018
@@ -163,7 +163,7 @@ public class VersionTest extends Abstrac
}
@Test
- public void testReadVersionContentNoAccess() throws Exception {
+ public void testReadVersionContentNoAccess() {
IdentifierManager idMgr = new IdentifierManager(testRoot);
for (String path : noReadAccess) {
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/CallbackHandlerImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/CallbackHandlerImpl.java?rev=1848335&r1=1848334&r2=1848335&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/CallbackHandlerImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authentication/CallbackHandlerImpl.java
Thu Dec 6 15:55:56 2018
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.security.authentication;
-import java.io.IOException;
import javax.jcr.Credentials;
import javax.jcr.SimpleCredentials;
import javax.security.auth.callback.Callback;
@@ -64,7 +63,7 @@ class CallbackHandlerImpl implements Cal
//----------------------------------------------------< CallbackHandler
>---
@Override
- public void handle(Callback[] callbacks) throws IOException,
UnsupportedCallbackException {
+ public void handle(Callback[] callbacks) throws
UnsupportedCallbackException {
for (Callback callback : callbacks) {
if (callback instanceof CredentialsCallback) {
((CredentialsCallback) callback).setCredentials(credentials);
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=1848335&r1=1848334&r2=1848335&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 Dec 6 15:55:56 2018
@@ -114,7 +114,7 @@ public class AccessControlImporter imple
}
@Override
- public void processReferences() throws RepositoryException {
+ public void processReferences() {
// nothing to do.
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlValidator.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlValidator.java?rev=1848335&r1=1848334&r2=1848335&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlValidator.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/accesscontrol/AccessControlValidator.java
Thu Dec 6 15:55:56 2018
@@ -115,7 +115,7 @@ class AccessControlValidator extends Def
}
@Override
- public void propertyDeleted(PropertyState before) throws
CommitFailedException {
+ public void propertyDeleted(PropertyState before) {
// nothing to do: mandatory properties will be enforced by node type
validator
}
@@ -136,7 +136,7 @@ class AccessControlValidator extends Def
}
@Override
- public Validator childNodeDeleted(String name, NodeState before) throws
CommitFailedException {
+ public Validator childNodeDeleted(String name, NodeState before) {
// nothing to do
return null;
}
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=1848335&r1=1848334&r2=1848335&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 Dec 6 15:55:56 2018
@@ -18,7 +18,7 @@ package org.apache.jackrabbit.oak.securi
import java.util.HashMap;
import java.util.Map;
-import org.apache.jackrabbit.oak.api.CommitFailedException;
+
import org.apache.jackrabbit.oak.plugins.nodetype.TypePredicate;
import org.apache.jackrabbit.oak.plugins.tree.RootProvider;
import org.apache.jackrabbit.oak.plugins.tree.TreeProvider;
@@ -94,8 +94,7 @@ public class PermissionHook implements P
@NotNull
@Override
public NodeState processCommit(
- NodeState before, NodeState after, CommitInfo info)
- throws CommitFailedException {
+ NodeState before, NodeState after, CommitInfo info) {
NodeBuilder rootAfter = after.builder();
permissionStore = getPermissionStore(rootAfter);
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionValidator.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionValidator.java?rev=1848335&r1=1848334&r2=1848335&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionValidator.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/authorization/permission/PermissionValidator.java
Thu Dec 6 15:55:56 2018
@@ -148,7 +148,7 @@ class PermissionValidator extends Defaul
@Override
- public Validator childNodeChanged(String name, NodeState before, NodeState
after) throws CommitFailedException {
+ public Validator childNodeChanged(String name, NodeState before, NodeState
after) {
Tree childBefore = parentBefore.getChild(name);
Tree childAfter = parentAfter.getChild(name);
return nextValidator(childBefore, childAfter,
parentPermission.getChildPermission(name, before));
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/JcrAllCommitHook.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/JcrAllCommitHook.java?rev=1848335&r1=1848334&r2=1848335&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/JcrAllCommitHook.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/JcrAllCommitHook.java
Thu Dec 6 15:55:56 2018
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.security.privilege;
-import org.apache.jackrabbit.oak.api.CommitFailedException;
import org.apache.jackrabbit.oak.api.PropertyState;
import org.apache.jackrabbit.oak.api.Type;
import org.apache.jackrabbit.oak.plugins.memory.EmptyNodeState;
@@ -40,8 +39,7 @@ class JcrAllCommitHook implements PostVa
@NotNull
@Override
public NodeState processCommit(
- NodeState before, NodeState after, CommitInfo info)
- throws CommitFailedException {
+ NodeState before, NodeState after, CommitInfo info) {
NodeBuilder builder = after.builder();
after.compareAgainstBaseState(before, new PrivilegeDiff(null, null,
builder));
return builder.getNodeState();
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImpl.java?rev=1848335&r1=1848334&r2=1848335&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeManagerImpl.java
Thu Dec 6 15:55:56 2018
@@ -54,7 +54,7 @@ class PrivilegeManagerImpl implements Pr
//---------------------------------------------------< PrivilegeManager
>---
@Override
- public Privilege[] getRegisteredPrivileges() throws RepositoryException {
+ public Privilege[] getRegisteredPrivileges() {
Set<Privilege> privileges = new HashSet();
for (PrivilegeDefinition def : getPrivilegeDefinitions()) {
privileges.add(getPrivilege(def));
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidator.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidator.java?rev=1848335&r1=1848334&r2=1848335&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidator.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/privilege/PrivilegeValidator.java
Thu Dec 6 15:55:56 2018
@@ -59,7 +59,7 @@ class PrivilegeValidator extends Default
//----------------------------------------------------------< Validator
>---
@Override
- public void propertyAdded(PropertyState after) throws
CommitFailedException {
+ public void propertyAdded(PropertyState after) {
// no-op
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableBaseProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableBaseProvider.java?rev=1848335&r1=1848334&r2=1848335&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableBaseProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableBaseProvider.java
Thu Dec 6 15:55:56 2018
@@ -28,7 +28,6 @@ import org.jetbrains.annotations.NotNull
import org.jetbrains.annotations.Nullable;
import static com.google.common.base.Preconditions.checkNotNull;
-import static org.apache.jackrabbit.oak.commons.UUIDUtils.generateUUID;
import static
org.apache.jackrabbit.oak.plugins.identifier.IdentifierManager.getIdentifier;
/**
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableImpl.java?rev=1848335&r1=1848334&r2=1848335&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/AuthorizableImpl.java
Thu Dec 6 15:55:56 2018
@@ -134,7 +134,7 @@ abstract class AuthorizableImpl implemen
}
@Override
- public String getPath() throws RepositoryException {
+ public String getPath() {
return userManager.getNamePathMapper().getJcrPath(getTree().getPath());
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/GroupImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/GroupImpl.java?rev=1848335&r1=1848334&r2=1848335&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/GroupImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/GroupImpl.java
Thu Dec 6 15:55:56 2018
@@ -54,7 +54,7 @@ class GroupImpl extends AuthorizableImpl
//---------------------------------------------------< AuthorizableImpl
>---
@Override
- void checkValidTree(@NotNull Tree tree) throws RepositoryException {
+ void checkValidTree(@NotNull Tree tree) {
if (!UserUtil.isType(tree, AuthorizableType.GROUP)) {
throw new IllegalArgumentException("Invalid group node: node type
rep:Group expected.");
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/ImpersonationImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/ImpersonationImpl.java?rev=1848335&r1=1848334&r2=1848335&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/ImpersonationImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/ImpersonationImpl.java
Thu Dec 6 15:55:56 2018
@@ -52,7 +52,7 @@ class ImpersonationImpl implements Imper
private final UserImpl user;
private final PrincipalManager principalManager;
- ImpersonationImpl(@NotNull UserImpl user) throws RepositoryException {
+ ImpersonationImpl(@NotNull UserImpl user) {
this.user = user;
this.principalManager = user.getUserManager().getPrincipalManager();
}
@@ -61,7 +61,7 @@ class ImpersonationImpl implements Imper
@NotNull
@Override
- public PrincipalIterator getImpersonators() throws RepositoryException {
+ public PrincipalIterator getImpersonators() {
Set<String> impersonators = getImpersonatorNames();
if (impersonators.isEmpty()) {
return PrincipalIteratorAdapter.EMPTY;
@@ -123,7 +123,7 @@ class ImpersonationImpl implements Imper
}
@Override
- public boolean allows(@Nullable Subject subject) throws
RepositoryException {
+ public boolean allows(@Nullable Subject subject) {
if (subject == null) {
return false;
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/MembershipProvider.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/MembershipProvider.java?rev=1848335&r1=1848334&r2=1848335&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/MembershipProvider.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/MembershipProvider.java
Thu Dec 6 15:55:56 2018
@@ -340,7 +340,7 @@ class MembershipProvider extends Authori
* @return {@code true} if the member was added
* @throws RepositoryException if an error occurs
*/
- boolean addMember(@NotNull Tree groupTree, @NotNull Tree newMemberTree)
throws RepositoryException {
+ boolean addMember(@NotNull Tree groupTree, @NotNull Tree newMemberTree) {
return writer.addMember(groupTree, getContentID(newMemberTree));
}
@@ -351,7 +351,7 @@ class MembershipProvider extends Authori
* @param memberIds Map of 'contentId':'memberId' of all members to be
added.
* @return the set of member IDs that was not successfully processed.
*/
- Set<String> addMembers(@NotNull Tree groupTree, @NotNull Map<String,
String> memberIds) throws RepositoryException {
+ Set<String> addMembers(@NotNull Tree groupTree, @NotNull Map<String,
String> memberIds) {
return writer.addMembers(groupTree, memberIds);
}
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/MembershipWriter.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/MembershipWriter.java?rev=1848335&r1=1848334&r2=1848335&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/MembershipWriter.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/MembershipWriter.java
Thu Dec 6 15:55:56 2018
@@ -61,7 +61,7 @@ public class MembershipWriter {
* @return {@code true} if the member was added
* @throws RepositoryException if an error occurs
*/
- boolean addMember(Tree groupTree, String memberContentId) throws
RepositoryException {
+ boolean addMember(Tree groupTree, String memberContentId) {
Map<String, String> m = Maps.newHashMapWithExpectedSize(1);
m.put(memberContentId, "-");
return addMembers(groupTree, m).isEmpty();
@@ -75,7 +75,7 @@ public class MembershipWriter {
* @return the set of member IDs that was not successfully processed.
* @throws RepositoryException if an error occurs
*/
- Set<String> addMembers(@NotNull Tree groupTree, @NotNull Map<String,
String> memberIds) throws RepositoryException {
+ Set<String> addMembers(@NotNull Tree groupTree, @NotNull Map<String,
String> memberIds) {
// check all possible rep:members properties for the new member and
also find the one with the least values
Tree membersList = groupTree.getChild(UserConstants.REP_MEMBERS_LIST);
Iterator<Tree> trees = Iterators.concat(
Modified:
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImpl.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImpl.java?rev=1848335&r1=1848334&r2=1848335&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImpl.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/main/java/org/apache/jackrabbit/oak/security/user/UserImpl.java
Thu Dec 6 15:55:56 2018
@@ -99,7 +99,7 @@ class UserImpl extends AuthorizableImpl
}
@Override
- public Impersonation getImpersonation() throws RepositoryException {
+ public Impersonation getImpersonation() {
return new ImpersonationImpl(this);
}
@@ -146,12 +146,12 @@ class UserImpl extends AuthorizableImpl
}
@Override
- public boolean isDisabled() throws RepositoryException {
+ public boolean isDisabled() {
return getTree().hasProperty(REP_DISABLED);
}
@Override
- public String getDisabledReason() throws RepositoryException {
+ public String getDisabledReason() {
PropertyState disabled = getTree().getProperty(REP_DISABLED);
if (disabled != null) {
return disabled.getValue(STRING);
