Author: angela
Date: Tue Mar 3 08:59:53 2015
New Revision: 1663554
URL: http://svn.apache.org/r1663554
Log:
minor improvement: simplify usage of ConfigurationParameters
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/PasswordExpiryAndForceInitialChangeTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/PasswordExpiryTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/PasswordForceInitialPasswordChangeTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/RandomAuthorizableNodeNameTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/ResetExpiredPasswordTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserConfigurationImplTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserInitializerTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/autosave/AutoSaveEnabledManagerTest.java
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/autosave/PasswordExpiryTest.java
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/PasswordExpiryAndForceInitialChangeTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/PasswordExpiryAndForceInitialChangeTest.java?rev=1663554&r1=1663553&r2=1663554&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/PasswordExpiryAndForceInitialChangeTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/PasswordExpiryAndForceInitialChangeTest.java
Tue Mar 3 08:59:53 2015
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.security.user;
-import java.util.HashMap;
import java.util.UUID;
import javax.jcr.SimpleCredentials;
import javax.security.auth.login.CredentialExpiredException;
@@ -38,7 +37,7 @@ import static org.junit.Assert.assertTru
import static org.junit.Assert.fail;
/**
- * @see OAK-1922
+ * @see <a href="https://issues.apache.org/jira/browse/OAK-1922";>OAK-1922</a>
*/
public class PasswordExpiryAndForceInitialChangeTest extends
AbstractSecurityTest {
@@ -52,10 +51,9 @@ public class PasswordExpiryAndForceIniti
@Override
protected ConfigurationParameters getSecurityConfigParameters() {
- ConfigurationParameters parameters = ConfigurationParameters.of(new
HashMap<String, Object>() {{
- put(UserConstants.PARAM_PASSWORD_MAX_AGE, 10);
- put(UserConstants.PARAM_PASSWORD_INITIAL_CHANGE, true);
- }});
+ ConfigurationParameters parameters = ConfigurationParameters.of(
+ UserConstants.PARAM_PASSWORD_MAX_AGE, 10,
+ UserConstants.PARAM_PASSWORD_INITIAL_CHANGE, true);
return
ConfigurationParameters.of(ImmutableMap.of(UserConfiguration.NAME, parameters));
}
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/PasswordExpiryTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/PasswordExpiryTest.java?rev=1663554&r1=1663553&r2=1663554&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/PasswordExpiryTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/PasswordExpiryTest.java
Tue Mar 3 08:59:53 2015
@@ -21,7 +21,6 @@ import javax.jcr.SimpleCredentials;
import javax.security.auth.login.CredentialExpiredException;
import javax.security.auth.login.LoginException;
-import com.google.common.collect.ImmutableMap;
import org.apache.jackrabbit.api.security.user.User;
import org.apache.jackrabbit.oak.AbstractSecurityTest;
import org.apache.jackrabbit.oak.api.PropertyState;
@@ -59,7 +58,7 @@ public class PasswordExpiryTest extends
@Override
protected ConfigurationParameters getSecurityConfigParameters() {
ConfigurationParameters userConfig =
ConfigurationParameters.of(UserConstants.PARAM_PASSWORD_MAX_AGE, 10);
- return
ConfigurationParameters.of(ImmutableMap.of(UserConfiguration.NAME, userConfig));
+ return ConfigurationParameters.of(UserConfiguration.NAME, userConfig);
}
@Test
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/PasswordForceInitialPasswordChangeTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/PasswordForceInitialPasswordChangeTest.java?rev=1663554&r1=1663553&r2=1663554&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/PasswordForceInitialPasswordChangeTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/PasswordForceInitialPasswordChangeTest.java
Tue Mar 3 08:59:53 2015
@@ -16,7 +16,6 @@
*/
package org.apache.jackrabbit.oak.security.user;
-import com.google.common.collect.ImmutableMap;
import org.apache.jackrabbit.api.security.user.User;
import org.apache.jackrabbit.oak.AbstractSecurityTest;
import org.apache.jackrabbit.oak.api.PropertyState;
@@ -39,7 +38,7 @@ import static org.junit.Assert.assertTru
import static org.junit.Assert.fail;
/**
- * @see OAK-1922
+ * @see <a href="https://issues.apache.org/jira/browse/OAK-1922";>OAK-1922</a>
*/
public class PasswordForceInitialPasswordChangeTest extends
AbstractSecurityTest {
@@ -55,7 +54,7 @@ public class PasswordForceInitialPasswor
protected ConfigurationParameters getSecurityConfigParameters() {
ConfigurationParameters userConfig = ConfigurationParameters.of(
UserConstants.PARAM_PASSWORD_INITIAL_CHANGE, true);
- return
ConfigurationParameters.of(ImmutableMap.of(UserConfiguration.NAME, userConfig));
+ return ConfigurationParameters.of(UserConfiguration.NAME, userConfig);
}
@Test
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/RandomAuthorizableNodeNameTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/RandomAuthorizableNodeNameTest.java?rev=1663554&r1=1663553&r2=1663554&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/RandomAuthorizableNodeNameTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/RandomAuthorizableNodeNameTest.java
Tue Mar 3 08:59:53 2015
@@ -57,7 +57,7 @@ public class RandomAuthorizableNodeNameT
@Override
protected ConfigurationParameters getSecurityConfigParameters() {
ConfigurationParameters userConfig =
ConfigurationParameters.of(UserConstants.PARAM_AUTHORIZABLE_NODE_NAME,
nameGenerator);
- return
ConfigurationParameters.of(ImmutableMap.of(UserConfiguration.NAME, userConfig));
+ return ConfigurationParameters.of(UserConfiguration.NAME, userConfig);
}
private void assertNodeName(Authorizable authorizable) throws
RepositoryException {
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/ResetExpiredPasswordTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/ResetExpiredPasswordTest.java?rev=1663554&r1=1663553&r2=1663554&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/ResetExpiredPasswordTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/ResetExpiredPasswordTest.java
Tue Mar 3 08:59:53 2015
@@ -16,7 +16,10 @@
*/
package org.apache.jackrabbit.oak.security.user;
-import com.google.common.collect.ImmutableMap;
+import javax.jcr.SimpleCredentials;
+import javax.security.auth.login.CredentialExpiredException;
+import javax.security.auth.login.LoginException;
+
import org.apache.jackrabbit.api.security.user.User;
import org.apache.jackrabbit.oak.AbstractSecurityTest;
import org.apache.jackrabbit.oak.api.Root;
@@ -30,10 +33,6 @@ import org.apache.jackrabbit.oak.spi.sec
import org.junit.Before;
import org.junit.Test;
-import javax.jcr.SimpleCredentials;
-import javax.security.auth.login.CredentialExpiredException;
-import javax.security.auth.login.LoginException;
-
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertTrue;
import static org.junit.Assert.fail;
@@ -60,7 +59,7 @@ public class ResetExpiredPasswordTest ex
@Override
protected ConfigurationParameters getSecurityConfigParameters() {
ConfigurationParameters userConfig =
ConfigurationParameters.of(UserConstants.PARAM_PASSWORD_MAX_AGE, 10);
- return
ConfigurationParameters.of(ImmutableMap.of(UserConfiguration.NAME, userConfig));
+ return ConfigurationParameters.of(UserConfiguration.NAME, userConfig);
}
private void authenticate(String expiredPw, Object newPw) throws
LoginException {
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserConfigurationImplTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserConfigurationImplTest.java?rev=1663554&r1=1663553&r2=1663554&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserConfigurationImplTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserConfigurationImplTest.java
Tue Mar 3 08:59:53 2015
@@ -16,7 +16,8 @@
*/
package org.apache.jackrabbit.oak.security.user;
-import com.google.common.collect.ImmutableMap;
+import java.util.HashMap;
+
import org.apache.jackrabbit.oak.AbstractSecurityTest;
import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration;
@@ -26,8 +27,6 @@ import org.apache.jackrabbit.oak.spi.xml
import org.apache.jackrabbit.oak.spi.xml.ProtectedItemImporter;
import org.junit.Test;
-import java.util.HashMap;
-
import static org.junit.Assert.assertEquals;
public class UserConfigurationImplTest extends AbstractSecurityTest {
@@ -45,7 +44,7 @@ public class UserConfigurationImplTest e
@Override
protected ConfigurationParameters getSecurityConfigParameters() {
- return
ConfigurationParameters.of(ImmutableMap.of(UserConfiguration.NAME,
getParams()));
+ return ConfigurationParameters.of(UserConfiguration.NAME, getParams());
}
@Test
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserInitializerTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserInitializerTest.java?rev=1663554&r1=1663553&r2=1663554&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserInitializerTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/UserInitializerTest.java
Tue Mar 3 08:59:53 2015
@@ -19,15 +19,12 @@ package org.apache.jackrabbit.oak.securi
import java.security.PrivilegedExceptionAction;
import java.util.HashMap;
import java.util.Map;
-
import javax.jcr.GuestCredentials;
import javax.jcr.SimpleCredentials;
import javax.security.auth.Subject;
import javax.security.auth.login.LoginException;
-import com.google.common.collect.ImmutableMap;
import com.google.common.collect.Iterables;
-
import org.apache.jackrabbit.api.security.user.Authorizable;
import org.apache.jackrabbit.api.security.user.User;
import org.apache.jackrabbit.api.security.user.UserManager;
@@ -44,9 +41,9 @@ import org.apache.jackrabbit.oak.plugins
import org.apache.jackrabbit.oak.plugins.nodetype.TypeEditorProvider;
import org.apache.jackrabbit.oak.plugins.nodetype.write.InitialContent;
import org.apache.jackrabbit.oak.security.SecurityProviderImpl;
-import org.apache.jackrabbit.oak.spi.security.authentication.SystemSubject;
import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
import org.apache.jackrabbit.oak.spi.security.SecurityProvider;
+import org.apache.jackrabbit.oak.spi.security.authentication.SystemSubject;
import org.apache.jackrabbit.oak.spi.security.principal.AdminPrincipal;
import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration;
import org.apache.jackrabbit.oak.spi.security.user.UserConstants;
@@ -145,7 +142,7 @@ public class UserInitializerTest extends
userParams.put(UserConstants.PARAM_ADMIN_ID, "admin");
userParams.put(UserConstants.PARAM_OMIT_ADMIN_PW, true);
- ConfigurationParameters params =
ConfigurationParameters.of(ImmutableMap.of(UserConfiguration.NAME,
ConfigurationParameters.of(userParams)));
+ ConfigurationParameters params =
ConfigurationParameters.of(UserConfiguration.NAME,
ConfigurationParameters.of(userParams));
SecurityProvider sp = new SecurityProviderImpl(params);
final ContentRepository repo = new Oak().with(new InitialContent())
.with(new PropertyIndexEditorProvider())
@@ -196,7 +193,7 @@ public class UserInitializerTest extends
Map<String,Object> userParams = new HashMap();
userParams.put(UserConstants.PARAM_ANONYMOUS_ID, "");
- ConfigurationParameters params =
ConfigurationParameters.of(ImmutableMap.of(UserConfiguration.NAME,
ConfigurationParameters.of(userParams)));
+ ConfigurationParameters params =
ConfigurationParameters.of(UserConfiguration.NAME,
ConfigurationParameters.of(userParams));
SecurityProvider sp = new SecurityProviderImpl(params);
final ContentRepository repo = new Oak().with(new InitialContent())
.with(new PropertyIndexEditorProvider())
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/autosave/AutoSaveEnabledManagerTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/autosave/AutoSaveEnabledManagerTest.java?rev=1663554&r1=1663553&r2=1663554&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/autosave/AutoSaveEnabledManagerTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/autosave/AutoSaveEnabledManagerTest.java
Tue Mar 3 08:59:53 2015
@@ -17,12 +17,10 @@
package org.apache.jackrabbit.oak.security.user.autosave;
import java.security.Principal;
-import java.util.Collections;
import java.util.Iterator;
import javax.jcr.RepositoryException;
import javax.jcr.Value;
-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.Impersonation;
@@ -69,8 +67,8 @@ public class AutoSaveEnabledManagerTest
@Override
protected ConfigurationParameters getSecurityConfigParameters() {
ConfigurationParameters userConfig = ConfigurationParameters.of(
- Collections.singletonMap(UserConstants.PARAM_SUPPORT_AUTOSAVE,
Boolean.TRUE));
- return
ConfigurationParameters.of(ImmutableMap.of(UserConfiguration.NAME, userConfig));
+ UserConstants.PARAM_SUPPORT_AUTOSAVE, Boolean.TRUE);
+ return ConfigurationParameters.of(UserConfiguration.NAME, userConfig);
}
@Test
Modified:
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/autosave/PasswordExpiryTest.java
URL:
http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/autosave/PasswordExpiryTest.java?rev=1663554&r1=1663553&r2=1663554&view=diff
==============================================================================
---
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/autosave/PasswordExpiryTest.java
(original)
+++
jackrabbit/oak/trunk/oak-core/src/test/java/org/apache/jackrabbit/oak/security/user/autosave/PasswordExpiryTest.java
Tue Mar 3 08:59:53 2015
@@ -16,22 +16,20 @@
*/
package org.apache.jackrabbit.oak.security.user.autosave;
-import com.google.common.collect.ImmutableMap;
import org.apache.jackrabbit.oak.spi.security.ConfigurationParameters;
import org.apache.jackrabbit.oak.spi.security.user.UserConfiguration;
import org.apache.jackrabbit.oak.spi.security.user.UserConstants;
/**
- * @see OAK-1922
+ * @see <a href="https://issues.apache.org/jira/browse/OAK-2156";>OAK-2156</a>
*/
public class PasswordExpiryTest extends
org.apache.jackrabbit.oak.security.user.PasswordExpiryTest {
@Override
protected ConfigurationParameters getSecurityConfigParameters() {
ConfigurationParameters userConfig = ConfigurationParameters.of(
- ImmutableMap.of(
- UserConstants.PARAM_PASSWORD_MAX_AGE, 10,
- UserConstants.PARAM_SUPPORT_AUTOSAVE, true));
- return
ConfigurationParameters.of(ImmutableMap.of(UserConfiguration.NAME, userConfig));
+ UserConstants.PARAM_PASSWORD_MAX_AGE, 10,
+ UserConstants.PARAM_SUPPORT_AUTOSAVE, true);
+ return ConfigurationParameters.of(UserConfiguration.NAME, userConfig);
}
}
\ No newline at end of file
