Sharad Mishra has uploaded a new change for review.
Change subject: core: Remove deprecated StringHelper in DbUserCacheManager.
......................................................................
core: Remove deprecated StringHelper in DbUserCacheManager.
Replaced StringHelper with StringUtils
Change-Id: I56b2aa0906f04e51e500b597884e2a27b27aec7f
Signed-off-by: Sharad Mishra <snmis...@linux.vnet.ibm.com>
---
M
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/DbUserCacheManager.java
1 file changed, 12 insertions(+), 12 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/76/7276/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 1b75221..ca097c6 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
@@ -5,6 +5,7 @@
import java.util.List;
import java.util.concurrent.TimeUnit;
+import org.apache.commons.lang.StringUtils;
import org.ovirt.engine.core.bll.adbroker.AdActionType;
import org.ovirt.engine.core.bll.adbroker.LdapBrokerUtils;
import org.ovirt.engine.core.bll.adbroker.LdapFactory;
@@ -21,7 +22,6 @@
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.utils.log.Log;
import org.ovirt.engine.core.utils.log.LogFactory;
-import org.ovirt.engine.core.compat.StringHelper;
import org.ovirt.engine.core.dal.dbbroker.DbFacade;
import org.ovirt.engine.core.utils.linq.LinqUtils;
import org.ovirt.engine.core.utils.linq.Predicate;
@@ -107,40 +107,40 @@
dbUser.setstatus(1);
succeded = true;
}
- if (!StringHelper.EqOp(dbUser.getname(), adUser.getName())) {
+ if (!StringUtils.equals(dbUser.getname(), adUser.getName())) {
dbUser.setname(adUser.getName());
succeded = true;
}
- if (!StringHelper.EqOp(dbUser.getsurname(), adUser.getSurName())) {
+ if (!StringUtils.equals(dbUser.getsurname(), adUser.getSurName()))
{
dbUser.setsurname(adUser.getSurName());
succeded = true;
}
- if (!StringHelper.EqOp(dbUser.getdomain(),
adUser.getDomainControler())) {
+ if (!StringUtils.equals(dbUser.getdomain(),
adUser.getDomainControler())) {
dbUser.setdomain(adUser.getDomainControler());
succeded = true;
}
- if (!StringHelper.EqOp(dbUser.getusername(),
adUser.getUserName())) {
+ if (!StringUtils.equals(dbUser.getusername(),
adUser.getUserName())) {
dbUser.setusername(adUser.getUserName());
succeded = true;
}
- if (!StringHelper.EqOp(dbUser.getgroups(), adUser.getGroup())) {
+ if (!StringUtils.equals(dbUser.getgroups(), adUser.getGroup())) {
dbUser.setgroups(adUser.getGroup());
succeded = true;
updatedUsers.add(dbUser.getuser_id());
}
- if (!StringHelper.EqOp(dbUser.getdepartment(),
adUser.getDepartment())) {
+ if (!StringUtils.equals(dbUser.getdepartment(),
adUser.getDepartment())) {
dbUser.setdepartment(adUser.getDepartment());
succeded = true;
}
- if (!StringHelper.EqOp(dbUser.getrole(), adUser.getTitle())) {
+ if (!StringUtils.equals(dbUser.getrole(), adUser.getTitle())) {
dbUser.setrole(adUser.getTitle());
succeded = true;
}
- if (!StringHelper.EqOp(dbUser.getemail(), adUser.getEmail())) {
+ if (!StringUtils.equals(dbUser.getemail(), adUser.getEmail())) {
dbUser.setemail(adUser.getEmail());
succeded = true;
}
- if (!StringHelper.EqOp(dbUser.getGroupIds(),
adUser.getGroupIds())) {
+ if (!StringUtils.equals(dbUser.getGroupIds(),
adUser.getGroupIds())) {
dbUser.setGroupIds(adUser.getGroupIds());
succeded = true;
}
@@ -281,9 +281,9 @@
group.setstatus(AdRefStatus.Inactive);
DbFacade.getInstance().getAdGroupDAO().update(group);
} else if (groupFromAD != null
- && (!StringHelper.EqOp(group.getname(),
groupFromAD.getname())
+ && (!StringUtils.equals(group.getname(),
groupFromAD.getname())
|| group.getstatus() != groupFromAD
- .getstatus() ||
!StringHelper.EqOp(group.getDistinguishedName(),
+ .getstatus() ||
!StringUtils.equals(group.getDistinguishedName(),
groupFromAD.getDistinguishedName()))) {
DbFacade.getInstance().getAdGroupDAO().update(groupFromAD);
}
--
To view, visit http://gerrit.ovirt.org/7276
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I56b2aa0906f04e51e500b597884e2a27b27aec7f
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Sharad Mishra <snmis...@linux.vnet.ibm.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
