[Engine-patches] Change in ovirt-engine[master]: core: Remove StringHelper from vdsbroker package

[amureini]

Allon Mureinik has uploaded a new change for review.

Change subject: core: Remove StringHelper from vdsbroker package
......................................................................

core: Remove StringHelper from vdsbroker package

Remove the last leftovers of the deprecated StringHelper usages from the
vdsbroker package and replace them with apache's standard StringUtils.

Change-Id: I06a0bffa6712fe38b5985d92c6860af37c54985c
Signed-off-by: Allon Mureinik <amure...@redhat.com>
---
M 
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java
M 
backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/UpdateVMVDSCommand.java
2 files changed, 6 insertions(+), 7 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/08/11608/1

diff --git 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java
 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java
index 5c08c1f..91796a1 100644
--- 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java
+++ 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/VdsUpdateRunTimeInfo.java
@@ -48,7 +48,6 @@
 import 
org.ovirt.engine.core.common.vdscommands.VdsIdAndVdsVDSCommandParametersBase;
 import org.ovirt.engine.core.compat.Guid;
 import org.ovirt.engine.core.compat.RefObject;
-import org.ovirt.engine.core.compat.StringHelper;
 import org.ovirt.engine.core.compat.TransactionScopeOption;
 import org.ovirt.engine.core.dal.dbbroker.DbFacade;
 import org.ovirt.engine.core.dal.dbbroker.auditloghandling.AuditLogDirector;
@@ -724,8 +723,8 @@
                     log.info(message);
 
                     AuditLogableBase logable = new 
AuditLogableBase(_vds.getId());
-                    logable.AddCustomValue("Networks", 
StringHelper.trimEnd(sNetworks.toString(), ',', ' '));
-                    logable.AddCustomValue("Interfaces", 
StringHelper.trimEnd(sNics.toString(), ',', ' '));
+                    logable.AddCustomValue("Networks", 
StringUtils.stripEnd(sNetworks.toString(), ", "));
+                    logable.AddCustomValue("Interfaces", 
StringUtils.stripEnd(sNics.toString(), ", "));
                     auditLog(logable, 
AuditLogType.VDS_SET_NONOPERATIONAL_IFACE_DOWN);
                 } catch (Exception e) {
                     log.error(String.format("checkInterface: Failure on moving 
host: %s to non-operational.",
@@ -873,7 +872,7 @@
             sb.append(tokens[i])
                     .append(".");
         }
-        String ifaceName = StringHelper.trimEnd(sb.toString(), '.');
+        String ifaceName = StringUtils.stripEnd(sb.toString(), ".");
         for (VdsNetworkInterface iface : _vds.getInterfaces()) {
             if (iface.getName().equals(ifaceName)) {
                 return iface.getStatistics().getStatus() == InterfaceStatus.UP;
@@ -1393,7 +1392,7 @@
             if (!inMigrationTo(runningVm, vmToUpdate) && runningVm.getstatus() 
!= VMStatus.Down) {
                 if (vmToUpdate != null) {
                     if (_vmDict.containsKey(vmToUpdate.getId())
-                            && !StringHelper.EqOp(runningVm.getclient_ip(), 
vmToUpdate.getClientIp())) {
+                            && !StringUtils.equals(runningVm.getclient_ip(), 
vmToUpdate.getClientIp())) {
                         _vmsClientIpChanged.put(vmToUpdate, runningVm);
                     }
                 }
diff --git 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/UpdateVMVDSCommand.java
 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/UpdateVMVDSCommand.java
index 72afb72..ae78c4c 100644
--- 
a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/UpdateVMVDSCommand.java
+++ 
b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/UpdateVMVDSCommand.java
@@ -4,11 +4,11 @@
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.lang.StringUtils;
 import org.ovirt.engine.core.common.errors.VdcBllErrors;
 import org.ovirt.engine.core.common.vdscommands.UpdateVMVDSCommandParameters;
 import org.ovirt.engine.core.compat.Guid;
 import org.ovirt.engine.core.compat.KeyValuePairCompat;
-import org.ovirt.engine.core.compat.StringHelper;
 import org.ovirt.engine.core.vdsbroker.vdsbroker.VDSExceptionBase;
 
 public class UpdateVMVDSCommand<P extends UpdateVMVDSCommandParameters> 
extends IrsBrokerCommand<P> {
@@ -43,7 +43,7 @@
                 imageList[i] = imagesGuidList.get(i).toString();
             }
 
-            vmToSend.put("imglist", StringHelper.join(",", imageList));
+            vmToSend.put("imglist", StringUtils.join(imageList, ','));
             result[counter] = vmToSend;
             counter++;
         }


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

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