[Engine-patches] Change in ovirt-engine[master]: core: remove unused code and fix param name

[abonas]

Alissa Bonas has uploaded a new change for review.

Change subject: core: remove unused code and fix param name
......................................................................

core: remove unused code and fix param name

Remove unused code and fix param name from adUser to ldapUser

Change-Id: Ic242cc5da9dfe4c70c671b90f2eed49ad3d35723
Signed-off-by: Alissa Bonas <abo...@redhat.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DbUserCacheManager.java
1 file changed, 24 insertions(+), 26 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/22/11022/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DbUserCacheManager.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DbUserCacheManager.java
index 758cc69..a1f3946 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DbUserCacheManager.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DbUserCacheManager.java
@@ -80,20 +80,18 @@
     /**
      * detect differences between current DB users and the directory server 
users/groups and persist them
      *
-     * @param DbUser
+     * @param dbUser
      *            DB user
-     * @param LdapUser
+     * @param ldapUser
      *            LDAP user
      * @param updatedUsers
      *            list of changed users.
      */
-    private void updateDBUserFromADUser(DbUser dbUser, LdapUser adUser, 
HashSet<Guid> updatedUsers) {
+    private void updateDBUserFromADUser(DbUser dbUser, LdapUser ldapUser, 
HashSet<Guid> updatedUsers) {
         boolean succeded = false;
-        // AdUser adUser =
-        // LdapFactory.Instance.GetAdUserByUserIdAndDomain(dbUser.user_id,
-        // dbUser.domain);
-        if ((adUser == null) || (adUser.getUserId().equals(Guid.Empty))
-                || (!adUser.getUserId().equals(dbUser.getuser_id()))) {
+
+        if ((ldapUser == null) || (ldapUser.getUserId().equals(Guid.Empty))
+                || (!ldapUser.getUserId().equals(dbUser.getuser_id()))) {
             if (dbUser.getstatus() != 0) {
                 log.warnFormat("User {0} not found in directory server, its 
status switched to InActive",
                         dbUser.getname());
@@ -107,41 +105,41 @@
                 dbUser.setstatus(1);
                 succeded = true;
             }
-            if (!StringUtils.equals(dbUser.getname(), adUser.getName())) {
-                dbUser.setname(adUser.getName());
+            if (!StringUtils.equals(dbUser.getname(), ldapUser.getName())) {
+                dbUser.setname(ldapUser.getName());
                 succeded = true;
             }
-            if (!StringUtils.equals(dbUser.getsurname(), adUser.getSurName())) 
{
-                dbUser.setsurname(adUser.getSurName());
+            if (!StringUtils.equals(dbUser.getsurname(), 
ldapUser.getSurName())) {
+                dbUser.setsurname(ldapUser.getSurName());
                 succeded = true;
             }
-            if (!StringUtils.equals(dbUser.getdomain(), 
adUser.getDomainControler())) {
-                dbUser.setdomain(adUser.getDomainControler());
+            if (!StringUtils.equals(dbUser.getdomain(), 
ldapUser.getDomainControler())) {
+                dbUser.setdomain(ldapUser.getDomainControler());
                 succeded = true;
             }
-            if (!StringUtils.equals(dbUser.getusername(), 
adUser.getUserName())) {
-                dbUser.setusername(adUser.getUserName());
+            if (!StringUtils.equals(dbUser.getusername(), 
ldapUser.getUserName())) {
+                dbUser.setusername(ldapUser.getUserName());
                 succeded = true;
             }
-            if (!StringUtils.equals(dbUser.getgroups(), adUser.getGroup())) {
-                dbUser.setgroups(adUser.getGroup());
+            if (!StringUtils.equals(dbUser.getgroups(), ldapUser.getGroup())) {
+                dbUser.setgroups(ldapUser.getGroup());
                 succeded = true;
                 updatedUsers.add(dbUser.getuser_id());
             }
-            if (!StringUtils.equals(dbUser.getdepartment(), 
adUser.getDepartment())) {
-                dbUser.setdepartment(adUser.getDepartment());
+            if (!StringUtils.equals(dbUser.getdepartment(), 
ldapUser.getDepartment())) {
+                dbUser.setdepartment(ldapUser.getDepartment());
                 succeded = true;
             }
-            if (!StringUtils.equals(dbUser.getrole(), adUser.getTitle())) {
-                dbUser.setrole(adUser.getTitle());
+            if (!StringUtils.equals(dbUser.getrole(), ldapUser.getTitle())) {
+                dbUser.setrole(ldapUser.getTitle());
                 succeded = true;
             }
-            if (!StringUtils.equals(dbUser.getemail(), adUser.getEmail())) {
-                dbUser.setemail(adUser.getEmail());
+            if (!StringUtils.equals(dbUser.getemail(), ldapUser.getEmail())) {
+                dbUser.setemail(ldapUser.getEmail());
                 succeded = true;
             }
-            if (!StringUtils.equals(dbUser.getGroupIds(), 
adUser.getGroupIds())) {
-                dbUser.setGroupIds(adUser.getGroupIds());
+            if (!StringUtils.equals(dbUser.getGroupIds(), 
ldapUser.getGroupIds())) {
+                dbUser.setGroupIds(ldapUser.getGroupIds());
                 succeded = true;
             }
             if (succeded) {


--
To view, visit http://gerrit.ovirt.org/11022
To unsubscribe, visit http://gerrit.ovirt.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ic242cc5da9dfe4c70c671b90f2eed49ad3d35723
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Alissa Bonas <abo...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches