You are viewing a plain text version of this content. The canonical link for it is here.
Posted to oak-commits@jackrabbit.apache.org by an...@apache.org on 2015/03/03 10:15:15 UTC
svn commit: r1663564 - in
/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action:
AccessControlActionTest.java PasswordValidationActionTest.java
Author: angela
Date: Tue Mar 3 09:15:14 2015
New Revision: 1663564
URL: http://svn.apache.org/r1663564
Log:
minor improvement: simplify usage of ConfigurationParameters
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/AccessControlActionTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/PasswordValidationActionTest.java
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/AccessControlActionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/AccessControlActionTest.java?rev=1663564&r1=1663563&r2=1663564&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/AccessControlActionTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/AccessControlActionTest.java Tue Mar 3 09:15:14 2015
@@ -16,14 +16,11 @@
*/
package org.apache.jackrabbit.oak.spi.security.user.action;
-import java.util.HashMap;
-import java.util.Map;
import javax.jcr.security.AccessControlList;
import javax.jcr.security.AccessControlManager;
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;
@@ -45,12 +42,11 @@ public class AccessControlActionTest ext
@Override
protected ConfigurationParameters getSecurityConfigParameters() {
- Map<String, String[]> map = new HashMap<String, String[]>();
- map.put(AccessControlAction.GROUP_PRIVILEGE_NAMES, new String[] {PrivilegeConstants.JCR_READ});
- map.put(AccessControlAction.USER_PRIVILEGE_NAMES, new String[] {PrivilegeConstants.JCR_ALL});
-
- ConfigurationParameters userConfig = ConfigurationParameters.of(map);
- return ConfigurationParameters.of(ImmutableMap.of(UserConfiguration.NAME, userConfig));
+ ConfigurationParameters userConfig = ConfigurationParameters.of(
+ AccessControlAction.GROUP_PRIVILEGE_NAMES, new String[] {PrivilegeConstants.JCR_READ},
+ AccessControlAction.USER_PRIVILEGE_NAMES, new String[] {PrivilegeConstants.JCR_ALL}
+ );
+ return ConfigurationParameters.of(UserConfiguration.NAME, userConfig);
}
@Test
Modified: jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/PasswordValidationActionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/PasswordValidationActionTest.java?rev=1663564&r1=1663563&r2=1663564&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/PasswordValidationActionTest.java (original)
+++ jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/spi/security/user/action/PasswordValidationActionTest.java Tue Mar 3 09:15:14 2015
@@ -17,9 +17,7 @@
package org.apache.jackrabbit.oak.spi.security.user.action;
import java.util.ArrayList;
-import java.util.Collections;
import java.util.List;
-import java.util.Map;
import javax.annotation.Nonnull;
import javax.jcr.RepositoryException;
import javax.jcr.nodetype.ConstraintViolationException;
@@ -62,7 +60,7 @@ public class PasswordValidationActionTes
testAction.reset();
pwAction.init(getSecurityProvider(), ConfigurationParameters.of(
- Collections.singletonMap(PasswordValidationAction.CONSTRAINT, "^.*(?=.{8,})(?=.*[a-z])(?=.*[A-Z]).*")));
+ PasswordValidationAction.CONSTRAINT, "^.*(?=.{8,})(?=.*[a-z])(?=.*[A-Z]).*"));
}
@@ -143,7 +141,7 @@ public class PasswordValidationActionTes
testUser = getUserManager(root).createUser("testuser", "testPw123456");
root.commit();
try {
- pwAction.init(getSecurityProvider(), ConfigurationParameters.of(Collections.singletonMap(PasswordValidationAction.CONSTRAINT, "abc")));
+ pwAction.init(getSecurityProvider(), ConfigurationParameters.of(PasswordValidationAction.CONSTRAINT, "abc"));
String hashed = PasswordUtil.buildPasswordHash("abc");
testUser.changePassword(hashed);
@@ -196,8 +194,8 @@ public class PasswordValidationActionTes
@Nonnull
@Override
public ConfigurationParameters getParameters() {
- Map<String, AuthorizableActionProvider> m = Collections.singletonMap(UserConstants.PARAM_AUTHORIZABLE_ACTION_PROVIDER, actionProvider);
- return ConfigurationParameters.of(super.getParameters(), ConfigurationParameters.of(m));
+ return ConfigurationParameters.of(super.getParameters(),
+ ConfigurationParameters.of(UserConstants.PARAM_AUTHORIZABLE_ACTION_PROVIDER, actionProvider));
}
};
} else {