Juan Hernandez has uploaded a new change for review.
Change subject: core: Remove password from LdapUser
......................................................................
core: Remove password from LdapUser
This attribute is no longer used.
Change-Id: Ie3390bbbd5fe92c70861ff6dc12435e37d391fe3
Signed-off-by: Juan Hernandez <juan.hernan...@redhat.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapAuthenticateUserCommand.java
M
backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/LdapUserSearchQueryTest.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LdapUser.java
M
backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/users/VdcUserTest.java
4 files changed, 3 insertions(+), 14 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/03/17103/1
diff --git
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapAuthenticateUserCommand.java
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapAuthenticateUserCommand.java
index 6bd80b3..802fef4 100644
---
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapAuthenticateUserCommand.java
+++
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapAuthenticateUserCommand.java
@@ -54,7 +54,6 @@
} else {
user = populateUserData((LdapUser) searchResult,
getAuthenticationDomain());
if (user != null) {
- user.setPassword(getPassword());
user.setUserName(getLoginName());
GroupsDNQueryGenerator generator =
createGroupsGeneratorForUser(user);
if (generator.getHasValues()) {
diff --git
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/LdapUserSearchQueryTest.java
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/LdapUserSearchQueryTest.java
index c6e6912..7176a21 100644
---
a/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/LdapUserSearchQueryTest.java
+++
b/backend/manager/modules/bll/src/test/java/org/ovirt/engine/core/bll/LdapUserSearchQueryTest.java
@@ -31,7 +31,7 @@
@Override
protected LdapUser getExpectedResult() {
- return new LdapUser(NAME_TO_SEARCH, "melon!", Guid.newGuid(), DOMAIN);
+ return new LdapUser(NAME_TO_SEARCH, Guid.newGuid(), DOMAIN);
}
@Override
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LdapUser.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LdapUser.java
index 6e10a9a..3bdc12c 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LdapUser.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LdapUser.java
@@ -18,7 +18,6 @@
private static final long serialVersionUID = 6800096193162766377L;
private Guid mUserId = Guid.Empty;
private String mUserName;
- private String mPassword;
private String mDomainControler;
private String mName;
private String mSurName;
@@ -46,9 +45,8 @@
mGroups = new HashMap<String, LdapGroup>();
}
- public LdapUser(String userName, String password, Guid userId, String
domainControler) {
+ public LdapUser(String userName, Guid userId, String domainControler) {
mUserName = userName;
- mPassword = password;
mUserId = userId;
mDomainControler = domainControler;
mGroups = new HashMap<String, LdapGroup>();
@@ -60,14 +58,6 @@
public void setUserName(String value) {
mUserName = value;
- }
-
- public String getPassword() {
- return mPassword;
- }
-
- public void setPassword(String value) {
- mPassword = value;
}
public Guid getUserId() {
diff --git
a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/users/VdcUserTest.java
b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/users/VdcUserTest.java
index 59961ce..03666bb 100644
---
a/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/users/VdcUserTest.java
+++
b/backend/manager/modules/common/src/test/java/org/ovirt/engine/core/common/users/VdcUserTest.java
@@ -16,7 +16,7 @@
@Before
public void setUp() {
- adUser = new LdapUser("UserName", "password", Guid.newGuid(),
"DomainController");
+ adUser = new LdapUser("UserName", Guid.newGuid(), "DomainController");
}
/** Tests {@link VdcUser#VdcUser(LdapUser)) */
--
To view, visit http://gerrit.ovirt.org/17103
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie3390bbbd5fe92c70861ff6dc12435e37d391fe3
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Juan Hernandez <juan.hernan...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
