FC-314 - Cleanup User Constructor
diff --git a/src/main/java/org/apache/directory/fortress/core/AdminMgr.java b/src/main/java/org/apache/directory/fortress/core/AdminMgr.java
index dcb6e74..076ff23 100755
--- a/src/main/java/org/apache/directory/fortress/core/AdminMgr.java
+++ b/src/main/java/org/apache/directory/fortress/core/AdminMgr.java
@@ -112,13 +112,6 @@
* User#props * - multivalued attribute contains property key and values are separated with a ':'.
* e.g. mykey1:myvalue1
* </li>
- * <li>
- * User#roles * - multivalued attribute contains the name of already existing role to assign to user
- * </li>
- * <li>
- * User#adminRoles * - multivalued attribute contains the name of already existing adminRole to assign
- * to user
- * </li>
* </ul>
*
* @param user User entity must contain User#userId and User#ou (required) and optional
@@ -210,13 +203,6 @@
* User#props * - multivalued attribute contains property key and values are separated with a ':'.
* e.g. mykey1:myvalue1
* </li>
- * <li>
- * User#roles * - multivalued attribute contains the name of already existing role to assign to user
- * </li>
- * <li>
- * User#adminRoles * - multivalued attribute contains the name of already existing adminRole to assign
- * to user
- * </li>
* </ul>
*
* @param user must contain User#userId and optional entity data to update i.e. desc, ou, properties, all
diff --git a/src/main/java/org/apache/directory/fortress/core/model/User.java b/src/main/java/org/apache/directory/fortress/core/model/User.java
index 27eaab9..1a04544 100755
--- a/src/main/java/org/apache/directory/fortress/core/model/User.java
+++ b/src/main/java/org/apache/directory/fortress/core/model/User.java
@@ -411,21 +411,6 @@
*
* @param userId String validated using simple length test and optional regular expression, i.e. safe text.
* @param password validated using simple length test and OpenLDAP password policies.
- * @param roleName contains role that caller is requesting activation.
- */
- public User( String userId, String password, String roleName )
- {
- this.userId = userId;
- this.password = password;
- setRole( new UserRole( roleName ) );
- }
-
-
- /**
- * Construct User given userId and password. Once loaded this entity can be passed to AccessMgr.createSession.
- *
- * @param userId String validated using simple length test and optional regular expression, i.e. safe text.
- * @param password validated using simple length test and OpenLDAP password policies.
* @param roleNames contains array of roleNames that caller is requesting activation.
*/
public User( String userId, String password, String[] roleNames )
@@ -448,14 +433,12 @@
*
* @param userId String validated using simple length test and optional regular expression, i.e. safe text.
* @param password validated using simple length test and OpenLDAP password policies.
- * @param roleName contains role that caller is requesting activation (see {@link org.apache.directory.fortress.core.AccessMgr#createSession(User, boolean)}) or assignment (see {@link org.apache.directory.fortress.core.AdminMgr#addUser(User)}).
* @param ou org unit name that caller is requesting assigned to newly created User (see {@link org.apache.directory.fortress.core.AdminMgr#addUser(User)}).
*/
- public User( String userId, String password, String roleName, String ou )
+ public User( String userId, String password, String ou )
{
this.userId = userId;
this.password = password;
- setRole( new UserRole( roleName ) );
this.ou = ou;
}
diff --git a/src/test/java/org/apache/directory/fortress/core/impl/AccessMgrImplTest.java b/src/test/java/org/apache/directory/fortress/core/impl/AccessMgrImplTest.java
index 1e5d43a..816b6c2 100755
--- a/src/test/java/org/apache/directory/fortress/core/impl/AccessMgrImplTest.java
+++ b/src/test/java/org/apache/directory/fortress/core/impl/AccessMgrImplTest.java
@@ -353,8 +353,7 @@
// Instantiate the AdminMgr first
AdminMgr adminMgr = AdminMgrFactory.createInstance();
- User myUser = new User( "myUserId", "myPassword", "Test", "People" );
-
+ User myUser = new User( "myUserId", "myPassword", "People" );
adminMgr.addUser( myUser );
}
catch (SecurityException ex)
diff --git a/src/test/java/org/apache/directory/fortress/core/samples/CreateSessionSample.java b/src/test/java/org/apache/directory/fortress/core/samples/CreateSessionSample.java
index c754ce0..f14002a 100755
--- a/src/test/java/org/apache/directory/fortress/core/samples/CreateSessionSample.java
+++ b/src/test/java/org/apache/directory/fortress/core/samples/CreateSessionSample.java
@@ -188,7 +188,8 @@
AccessMgr accessMgr = AccessMgrFactory.createInstance(TestUtils.getContext());
// The User entity is used to pass data into the createSession API.
- User user = new User(userId, password, role);
+ User user = new User(userId, password);
+ user.setRoleName(role);
// The API will authenticate the User password, evaluate password policies and perform Role activations.
Session session = accessMgr.createSession(user, false);
diff --git a/src/test/java/org/apache/directory/fortress/core/samples/CreateUserSample.java b/src/test/java/org/apache/directory/fortress/core/samples/CreateUserSample.java
index f238659..87f68b1 100755
--- a/src/test/java/org/apache/directory/fortress/core/samples/CreateUserSample.java
+++ b/src/test/java/org/apache/directory/fortress/core/samples/CreateUserSample.java
@@ -173,8 +173,7 @@
*/
//User inUser = new User(TEST_USERID, TEST_PASSWORD, CreateRoleSample.TEST_SIMPLE_ROLE, CreateUserOrgSample.TEST_USER_OU_NM);
//User inUser = new User(TEST_USERID, TEST_PASSWORD, CreateRoleSample.TEST_SIMPLE_ROLE, CreateUserOrgSample.TEST_USER_OU_NM);
- User inUser = new User(TEST_USERID, TEST_PASSWORD);
- inUser.setOu(CreateUserOrgSample.TEST_USER_OU_NM);
+ User inUser = new User(TEST_USERID, TEST_PASSWORD, CreateUserOrgSample.TEST_USER_OU_NM);
// Now call the add API. The API will return User entity with associated LDAP dn if creation was successful.
User outUser = adminMgr.addUser(inUser);
