Author: angela
Date: Tue Mar 3 08:56:45 2015
New Revision: 1663551
URL: http://svn.apache.org/r1663551
Log:
minor improvement: simplify usage of ConfigurationParameters
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/AbstractImportTest.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportPwExpiryTest.java
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportWithActionsTest.java
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/AbstractImportTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/AbstractImportTest.java?rev=1663551&r1=1663550&r2=1663551&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/AbstractImportTest.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/AbstractImportTest.java
Tue Mar 3 08:56:45 2015
@@ -24,7 +24,6 @@ import java.util.HashSet;
import java.util.Iterator;
import java.util.Map;
import java.util.Set;
-
import javax.annotation.CheckForNull;
import javax.jcr.ImportUUIDBehavior;
import javax.jcr.Node;
@@ -51,8 +50,6 @@ import org.junit.After;
import org.junit.Before;
import org.junit.Test;
-import com.google.common.collect.ImmutableMap;
-
import static org.apache.jackrabbit.oak.jcr.AbstractRepositoryTest.dispose;
import static org.junit.Assert.assertFalse;
@@ -148,7 +145,7 @@ public abstract class AbstractImportTest
if (importBehavior != null) {
Map<String, String> userParams = new HashMap<String, String>();
userParams.put(ProtectedItemImporter.PARAM_IMPORT_BEHAVIOR,
getImportBehavior());
- return
ConfigurationParameters.of(ImmutableMap.of(UserConfiguration.NAME,
ConfigurationParameters.of(userParams)));
+ return ConfigurationParameters.of(UserConfiguration.NAME,
ConfigurationParameters.of(userParams));
} else {
return null;
}
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportPwExpiryTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportPwExpiryTest.java?rev=1663551&r1=1663550&r2=1663551&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportPwExpiryTest.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportPwExpiryTest.java
Tue Mar 3 08:56:45 2015
@@ -16,11 +16,11 @@
*/
package org.apache.jackrabbit.oak.jcr.security.user;
+import java.util.HashMap;
import javax.annotation.CheckForNull;
import javax.jcr.Node;
import javax.jcr.Property;
-import com.google.common.collect.ImmutableMap;
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.User;
import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
@@ -28,8 +28,6 @@ import org.apache.jackrabbit.oak.spi.sec
import org.apache.jackrabbit.oak.spi.security.user.UserConstants;
import org.junit.Test;
-import java.util.HashMap;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
@@ -57,7 +55,7 @@ public class UserImportPwExpiryTest exte
HashMap<String, Object> userParams = new HashMap<String, Object>() {{
put(UserConstants.PARAM_PASSWORD_MAX_AGE, 10);
}};
- return
ConfigurationParameters.of(ImmutableMap.of(UserConfiguration.NAME,
ConfigurationParameters.of(userParams)));
+ return ConfigurationParameters.of(UserConfiguration.NAME,
ConfigurationParameters.of(userParams));
}
/**
Modified:
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportWithActionsTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportWithActionsTest.java?rev=1663551&r1=1663550&r2=1663551&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportWithActionsTest.java
(original)
+++
jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportWithActionsTest.java
Tue Mar 3 08:56:45 2015
@@ -17,7 +17,6 @@
package org.apache.jackrabbit.oak.jcr.security.user;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.HashMap;
import java.util.List;
import java.util.Map;
@@ -29,7 +28,6 @@ import javax.jcr.security.AccessControlM
import javax.jcr.security.AccessControlPolicy;
import javax.jcr.security.Privilege;
-import com.google.common.collect.ImmutableMap;
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.Group;
import org.apache.jackrabbit.api.security.user.User;
@@ -73,7 +71,7 @@ public class UserImportWithActionsTest e
protected ConfigurationParameters getConfigurationParameters() {
Map<String, Object> userParams = new HashMap<String, Object>();
userParams.put(UserConstants.PARAM_AUTHORIZABLE_ACTION_PROVIDER,
actionProvider);
- return
ConfigurationParameters.of(ImmutableMap.of(UserConfiguration.NAME,
ConfigurationParameters.of(userParams)));
+ return ConfigurationParameters.of(UserConfiguration.NAME,
ConfigurationParameters.of(userParams));
}
@Test
@@ -116,7 +114,7 @@ public class UserImportWithActionsTest e
@Test
public void testAccessControlActionExecutionForUser() throws Exception {
AccessControlAction a1 = new AccessControlAction();
- a1.init(securityProvider,
ConfigurationParameters.of(Collections.singletonMap(AccessControlAction.USER_PRIVILEGE_NAMES,
new String[] {Privilege.JCR_ALL})));
+ a1.init(securityProvider,
ConfigurationParameters.of(AccessControlAction.USER_PRIVILEGE_NAMES, new
String[] {Privilege.JCR_ALL}));
setAuthorizableActions(a1);
@@ -148,7 +146,7 @@ public class UserImportWithActionsTest e
@Test
public void testAccessControlActionExecutionForUser2() throws Exception {
AccessControlAction a1 = new AccessControlAction();
- a1.init(securityProvider,
ConfigurationParameters.of(Collections.singletonMap(AccessControlAction.USER_PRIVILEGE_NAMES,
new String[] {Privilege.JCR_ALL})));
+ a1.init(securityProvider,
ConfigurationParameters.of(AccessControlAction.USER_PRIVILEGE_NAMES, new
String[] {Privilege.JCR_ALL}));
setAuthorizableActions(a1);
String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
@@ -179,7 +177,7 @@ public class UserImportWithActionsTest e
@Test
public void testAccessControlActionExecutionForGroup() throws Exception {
AccessControlAction a1 = new AccessControlAction();
- a1.init(securityProvider,
ConfigurationParameters.of(Collections.singletonMap(AccessControlAction.GROUP_PRIVILEGE_NAMES,
new String[] {Privilege.JCR_READ})));
+ a1.init(securityProvider,
ConfigurationParameters.of(AccessControlAction.GROUP_PRIVILEGE_NAMES, new
String[] {Privilege.JCR_READ}));
setAuthorizableActions(a1);
String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
@@ -239,12 +237,12 @@ public class UserImportWithActionsTest e
}
@Override
- public void onRemove(Authorizable authorizable, Root root,
NamePathMapper namePathMapper) throws RepositoryException {
+ public void onRemove(Authorizable authorizable, Root root,
NamePathMapper namePathMapper) {
// ignore
}
@Override
- public void onPasswordChange(User user, String newPassword, Root root,
NamePathMapper namePathMapper) throws RepositoryException {
+ public void onPasswordChange(User user, String newPassword, Root root,
NamePathMapper namePathMapper) {
pw = newPassword;
}
}
