Allon Mureinik has uploaded a new change for review.

Change subject: core: Don't use StringHelper in bll package
......................................................................

core: Don't use StringHelper in bll package

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

Change-Id: Ie7daf463174660d063a9da2c7bbf20b4ad2389ec
Signed-off-by: Allon Mureinik <[email protected]>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddEventSubscriptionCommand.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeFloppyCommand.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetEventSubscribersBySubscriberIdGroupedQuery.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetPowerClientQuery.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRolesForDelegationByUserQuery.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetSystemStatisticsQuery.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsCommand.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LogoutUserCommand.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetVmTicketCommand.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/StopVmCommandBase.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateRoleCommand.java
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateCommand.java
12 files changed, 34 insertions(+), 41 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/33/11633/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddEventSubscriptionCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddEventSubscriptionCommand.java
index b111a21..e21af68 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddEventSubscriptionCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddEventSubscriptionCommand.java
@@ -2,17 +2,16 @@
 
 import java.util.List;
 
-
+import org.apache.commons.lang.StringUtils;
 import org.ovirt.engine.core.common.action.EventSubscriptionParametesBase;
 import org.ovirt.engine.core.common.businessentities.DbUser;
 import org.ovirt.engine.core.common.businessentities.EventMap;
 import org.ovirt.engine.core.common.businessentities.EventNotificationMethod;
 import org.ovirt.engine.core.common.businessentities.event_subscriber;
+import org.ovirt.engine.core.common.errors.VdcBLLException;
 import org.ovirt.engine.core.common.users.VdcUser;
 import org.ovirt.engine.core.compat.Guid;
-import org.ovirt.engine.core.compat.StringHelper;
 import org.ovirt.engine.core.dal.VdcBllMessages;
-import org.ovirt.engine.core.common.errors.VdcBLLException;
 import org.ovirt.engine.core.dal.dbbroker.DbFacade;
 
 public class AddEventSubscriptionCommand<T extends 
EventSubscriptionParametesBase> extends
@@ -97,7 +96,7 @@
         boolean retval = false;
         for (event_subscriber eventSubscriber : subscriptions) {
             if (subscriberId.equals(eventSubscriber.getsubscriber_id())
-                    && StringHelper.EqOp(eventSubscriber.getevent_up_name(), 
eventName)
+                    && StringUtils.equals(eventSubscriber.getevent_up_name(), 
eventName)
                     && eventSubscriber.getmethod_id() == methodId) {
                 retval = true;
                 break;
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeFloppyCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeFloppyCommand.java
index 10c2a9d..261e531 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeFloppyCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/ChangeFloppyCommand.java
@@ -4,7 +4,6 @@
 import org.ovirt.engine.core.common.action.ChangeDiskCommandParameters;
 import org.ovirt.engine.core.common.vdscommands.ChangeDiskVDSCommandParameters;
 import org.ovirt.engine.core.common.vdscommands.VDSCommandType;
-import org.ovirt.engine.core.compat.StringHelper;
 import org.ovirt.engine.core.compat.backendcompat.Path;
 import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogField;
 import org.ovirt.engine.core.dal.dbbroker.auditloghandling.CustomLogFields;
@@ -37,7 +36,7 @@
 
     @Override
     public AuditLogType getAuditLogTypeValue() {
-        return getSucceeded() ? StringHelper.EqOp(mCdImagePath, "") ? 
AuditLogType.USER_EJECT_VM_FLOPPY
+        return getSucceeded() ? "".equals(mCdImagePath) ? 
AuditLogType.USER_EJECT_VM_FLOPPY
                 : AuditLogType.USER_CHANGE_FLOPPY_VM : 
AuditLogType.USER_FAILED_CHANGE_FLOPPY_VM;
     }
 }
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetEventSubscribersBySubscriberIdGroupedQuery.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetEventSubscribersBySubscriberIdGroupedQuery.java
index 7f300a6..a4008bd 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetEventSubscribersBySubscriberIdGroupedQuery.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetEventSubscribersBySubscriberIdGroupedQuery.java
@@ -3,9 +3,9 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.commons.lang.StringUtils;
 import org.ovirt.engine.core.common.businessentities.event_subscriber;
 import 
org.ovirt.engine.core.common.queries.GetEventSubscribersBySubscriberIdParameters;
-import org.ovirt.engine.core.compat.StringHelper;
 import org.ovirt.engine.core.dal.dbbroker.DbFacade;
 
 public class GetEventSubscribersBySubscriberIdGroupedQuery<P extends 
GetEventSubscribersBySubscriberIdParameters>
@@ -37,7 +37,7 @@
 
             java.util.ArrayList<event_subscriber> groupedList = new 
ArrayList<event_subscriber>(dic.values());
             for (event_subscriber event : groupedList) {
-                event.settag_name(StringHelper.trim(event.gettag_name(), new 
char[] { ',', ' ' }));
+                event.settag_name(StringUtils.strip(event.gettag_name(), ", 
"));
             }
             getQueryReturnValue().setReturnValue(groupedList);
         } else {
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetPowerClientQuery.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetPowerClientQuery.java
index e581aaf..1400f21 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetPowerClientQuery.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetPowerClientQuery.java
@@ -2,12 +2,12 @@
 
 import java.util.List;
 
+import org.apache.commons.lang.StringUtils;
 import org.ovirt.engine.core.common.businessentities.VDS;
 import org.ovirt.engine.core.common.businessentities.VDSType;
 import org.ovirt.engine.core.common.config.Config;
 import org.ovirt.engine.core.common.config.ConfigValues;
 import 
org.ovirt.engine.core.common.queries.GetPowerClientByClientInfoParameters;
-import org.ovirt.engine.core.compat.StringHelper;
 import org.ovirt.engine.core.dal.dbbroker.DbFacade;
 import org.ovirt.engine.core.utils.log.Log;
 import org.ovirt.engine.core.utils.log.LogFactory;
@@ -24,7 +24,7 @@
 
     private VDS GetPowerClient(String client_ip) {
         VDS powerClient = null;
-        if (!StringHelper.isNullOrEmpty(client_ip)) {
+        if (StringUtils.isNotEmpty(client_ip)) {
             boolean powerClientLogDetection =
                     Config.<Boolean> 
GetValue(ConfigValues.PowerClientLogDetection);
             if (powerClientLogDetection) {
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRolesForDelegationByUserQuery.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRolesForDelegationByUserQuery.java
index 5d4fbb7..af2419b 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRolesForDelegationByUserQuery.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetRolesForDelegationByUserQuery.java
@@ -3,13 +3,13 @@
 import java.util.Iterator;
 import java.util.List;
 
+import org.apache.commons.lang.StringUtils;
 import org.ovirt.engine.core.bll.session.SessionDataContainer;
+import org.ovirt.engine.core.common.businessentities.Role;
 import org.ovirt.engine.core.common.businessentities.RoleType;
 import org.ovirt.engine.core.common.businessentities.permissions;
-import org.ovirt.engine.core.common.businessentities.Role;
 import org.ovirt.engine.core.common.interfaces.IVdcUser;
 import org.ovirt.engine.core.common.queries.VdcQueryParametersBase;
-import org.ovirt.engine.core.compat.StringHelper;
 import org.ovirt.engine.core.dal.dbbroker.DbFacade;
 
 public class GetRolesForDelegationByUserQuery<P extends 
VdcQueryParametersBase> extends QueriesCommandBase<P> {
@@ -45,7 +45,7 @@
     private IVdcUser getCurrentUser() {
         String sessionId = getParameters().getSessionId();
         IVdcUser user = null;
-        if (!StringHelper.isNullOrEmpty(sessionId)) {
+        if (StringUtils.isNotEmpty(sessionId)) {
             user = SessionDataContainer.getInstance().getUser(sessionId, 
false);
         }
         return user;
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetSystemStatisticsQuery.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetSystemStatisticsQuery.java
index a1aafb4..c350704 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetSystemStatisticsQuery.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/GetSystemStatisticsQuery.java
@@ -1,10 +1,10 @@
 package org.ovirt.engine.core.bll;
 
+import org.apache.commons.lang.StringUtils;
 import org.ovirt.engine.core.common.businessentities.StorageDomainStatus;
 import org.ovirt.engine.core.common.businessentities.VDSStatus;
 import org.ovirt.engine.core.common.businessentities.VMStatus;
 import org.ovirt.engine.core.common.queries.GetSystemStatisticsQueryParameters;
-import org.ovirt.engine.core.compat.StringHelper;
 import org.ovirt.engine.core.dal.dbbroker.DbFacade;
 
 public class GetSystemStatisticsQuery<P extends 
GetSystemStatisticsQueryParameters> extends QueriesCommandBase<P> {
@@ -69,7 +69,7 @@
                 (String.valueOf(VMStatus.Paused.getValue())),
                 (String.valueOf(VMStatus.Unknown.getValue())) };
         int active_vms = DbFacade.getInstance()
-                .GetSystemStatisticsValue("VM", StringHelper.join(",", 
activeVmStatuses));
+                .GetSystemStatisticsValue("VM", 
StringUtils.join(activeVmStatuses, ','));
 
         int down_vms = (total_vms - active_vms) < 0 ? 0 : (total_vms - 
active_vms);
 
@@ -79,7 +79,7 @@
         String[] activeVdsStatuses = { 
(String.valueOf(VDSStatus.Up.getValue())),
                 
(String.valueOf(VDSStatus.PreparingForMaintenance.getValue()))};
         int active_vds = 
DbFacade.getInstance().GetSystemStatisticsValue("HOST",
-                StringHelper.join(",", activeVdsStatuses));
+                StringUtils.join(activeVdsStatuses, ','));
         int maintenance_vds = 
DbFacade.getInstance().GetSystemStatisticsValue("HOST",
                 (String.valueOf(VDSStatus.Maintenance.getValue())));
         int down_vds = (total_vds - active_vds - maintenance_vds) < 0 ? 0 : 
(total_vds - active_vds - maintenance_vds);
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsCommand.java
index 161b602..4ce257f 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/InstallVdsCommand.java
@@ -10,7 +10,6 @@
 import org.ovirt.engine.core.common.config.ConfigValues;
 import org.ovirt.engine.core.compat.Guid;
 import org.ovirt.engine.core.compat.RpmVersion;
-import org.ovirt.engine.core.compat.StringHelper;
 import org.ovirt.engine.core.compat.backendcompat.Path;
 import org.ovirt.engine.core.dal.VdcBllMessages;
 import org.ovirt.engine.core.utils.FileUtil;
@@ -225,13 +224,8 @@
         return getParameters().getIsReinstallOrUpgrade() && 
getVds().getvds_type() == VDSType.oVirtNode;
     }
 
-    protected String getErrorMessage(String msg)
-    {
-        return (
-                StringHelper.isNullOrEmpty(msg) ?
-                        GENERIC_ERROR :
-                            msg
-        );
+    protected String getErrorMessage(String msg) {
+        return (StringUtils.isEmpty(msg) ? GENERIC_ERROR : msg);
     }
 
 }
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LogoutUserCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LogoutUserCommand.java
index 8838c8a..da82426 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LogoutUserCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/LogoutUserCommand.java
@@ -4,13 +4,12 @@
 import java.util.List;
 
 import org.ovirt.engine.core.bll.session.SessionDataContainer;
-import org.ovirt.engine.core.common.AuditLogType;
 import org.ovirt.engine.core.bll.utils.PermissionSubject;
+import org.ovirt.engine.core.common.AuditLogType;
 import org.ovirt.engine.core.common.action.LogoutUserParameters;
 import org.ovirt.engine.core.common.businessentities.DbUser;
 import org.ovirt.engine.core.common.users.VdcUser;
 import org.ovirt.engine.core.compat.Guid;
-import org.ovirt.engine.core.compat.StringHelper;
 import org.ovirt.engine.core.dal.dbbroker.DbFacade;
 
 public class LogoutUserCommand<T extends LogoutUserParameters> extends 
CommandBase<T> {
@@ -34,7 +33,7 @@
         if (httpSessionId != null) {
             
DbFacade.getInstance().getDbUserDao().removeUserSession(httpSessionId, userId);
             SessionDataContainer.getInstance().removeSession(httpSessionId);
-        } else if (!StringHelper.EqOp(getParameters().getSessionId(), "")) {
+        } else if (!"".equals(getParameters().getSessionId())) {
             
SessionDataContainer.getInstance().removeSession(getParameters().getSessionId());
         } else {
             SessionDataContainer.getInstance().removeSession();
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetVmTicketCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetVmTicketCommand.java
index c1535bb..a943208 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetVmTicketCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/SetVmTicketCommand.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import org.apache.commons.lang.StringUtils;
 import org.ovirt.engine.core.bll.utils.PermissionSubject;
 import org.ovirt.engine.core.common.VdcObjectType;
 import org.ovirt.engine.core.common.action.SetVmTicketParameters;
@@ -12,13 +13,12 @@
 import 
org.ovirt.engine.core.common.vdscommands.SetVmTicketVDSCommandParameters;
 import org.ovirt.engine.core.common.vdscommands.VDSCommandType;
 import org.ovirt.engine.core.compat.NGuid;
-import org.ovirt.engine.core.compat.StringHelper;
-import org.ovirt.engine.core.dal.dbbroker.DbFacade;
 import org.ovirt.engine.core.dal.VdcBllMessages;
+import org.ovirt.engine.core.dal.dbbroker.DbFacade;
 import org.ovirt.engine.core.dao.VmDynamicDAO;
+import org.ovirt.engine.core.utils.Ticketing;
 import org.ovirt.engine.core.utils.log.Log;
 import org.ovirt.engine.core.utils.log.LogFactory;
-import org.ovirt.engine.core.utils.Ticketing;
 
 @InternalCommandAttribute
 public class SetVmTicketCommand<T extends SetVmTicketParameters> extends 
VmOperationCommandBase<T> {
@@ -114,7 +114,7 @@
     protected void Perform() {
         // Generate the ticket if needed (in some situations the client will 
not send
         // a ticket):
-        if (StringHelper.isNullOrEmpty(mTicket)) {
+        if (StringUtils.isEmpty(mTicket)) {
             mTicket = Ticketing.GenerateOTP();
         }
 
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/StopVmCommandBase.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/StopVmCommandBase.java
index 1c130f2..c192b2d 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/StopVmCommandBase.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/StopVmCommandBase.java
@@ -3,11 +3,12 @@
 import java.util.ArrayList;
 import java.util.List;
 
+import org.apache.commons.lang.StringUtils;
+import org.ovirt.engine.core.bll.quota.QuotaConsumptionParameter;
+import org.ovirt.engine.core.bll.quota.QuotaStorageConsumptionParameter;
+import org.ovirt.engine.core.bll.quota.QuotaStorageDependent;
 import org.ovirt.engine.core.bll.quota.QuotaVdsDependent;
 import org.ovirt.engine.core.bll.quota.QuotaVdsGroupConsumptionParameter;
-import org.ovirt.engine.core.bll.quota.QuotaConsumptionParameter;
-import org.ovirt.engine.core.bll.quota.QuotaStorageDependent;
-import org.ovirt.engine.core.bll.quota.QuotaStorageConsumptionParameter;
 import org.ovirt.engine.core.bll.utils.PermissionSubject;
 import org.ovirt.engine.core.common.action.VmOperationParameterBase;
 import org.ovirt.engine.core.common.businessentities.DiskImage;
@@ -17,7 +18,6 @@
 import 
org.ovirt.engine.core.common.vdscommands.UpdateVmDynamicDataVDSCommandParameters;
 import org.ovirt.engine.core.common.vdscommands.VDSCommandType;
 import org.ovirt.engine.core.compat.Guid;
-import org.ovirt.engine.core.compat.StringHelper;
 import org.ovirt.engine.core.dal.VdcBllMessages;
 import org.ovirt.engine.core.dal.dbbroker.DbFacade;
 import org.ovirt.engine.core.utils.log.Log;
@@ -86,7 +86,7 @@
     protected void executeVmCommand() {
         getParameters().setEntityId(getVm().getId());
         if (getVm().getStatus() == VMStatus.Suspended
-                || 
!StringHelper.isNullOrEmpty(getVm().getHibernationVolHandle())) {
+                || StringUtils.isNotEmpty(getVm().getHibernationVolHandle())) {
             setSuspendedVm(true);
             setSucceeded(stopSuspendedVm());
         } else {
@@ -112,7 +112,7 @@
         if (getVm().getStatus() != VMStatus.ImageLocked) {
             // Set the VM to image locked to decrease race condition.
             updateVmStatus(VMStatus.ImageLocked);
-             if (!StringHelper.isNullOrEmpty(getVm().getHibernationVolHandle())
+            if (StringUtils.isNotEmpty(getVm().getHibernationVolHandle())
                     && handleHibernatedVm(getActionType(), false)) {
                 returnVal = true;
             } else {
@@ -171,6 +171,7 @@
 
     private static Log log = LogFactory.getLog(StopVmCommandBase.class);
 
+    @Override
     public List<QuotaConsumptionParameter> getQuotaVdsConsumptionParameters() {
         List<QuotaConsumptionParameter> list = new 
ArrayList<QuotaConsumptionParameter>();
 
@@ -189,6 +190,7 @@
         return list;
     }
 
+    @Override
     public List<QuotaConsumptionParameter> 
getQuotaStorageConsumptionParameters() {
         List<QuotaConsumptionParameter> list = new 
ArrayList<QuotaConsumptionParameter>();
         if (!getVm().isStateless()) {
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateRoleCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateRoleCommand.java
index c5be009..cca23e6 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateRoleCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateRoleCommand.java
@@ -1,9 +1,9 @@
 package org.ovirt.engine.core.bll;
 
+import org.apache.commons.lang.StringUtils;
 import org.ovirt.engine.core.common.AuditLogType;
 import org.ovirt.engine.core.common.action.RolesOperationsParameters;
 import org.ovirt.engine.core.common.businessentities.Role;
-import org.ovirt.engine.core.compat.StringHelper;
 import org.ovirt.engine.core.dal.VdcBllMessages;
 
 public class UpdateRoleCommand<T extends RolesOperationsParameters> extends 
RolesOperationCommandBase<T> {
@@ -29,7 +29,7 @@
             if 
(checkIfRoleIsReadOnly(getReturnValue().getCanDoActionMessages())) {
                 returnValue = false;
                 addCanDoActionMessage(VdcBllMessages.VAR__ACTION__UPDATE);
-            } else if (!StringHelper.EqOp(getRole().getname(), 
oldRole.getname())
+            } else if (!StringUtils.equals(getRole().getname(), 
oldRole.getname())
                     && getRoleDao().getByName(getRole().getname()) != null) {
                 
addCanDoActionMessage(VdcBllMessages.ERROR_CANNOT_UPDATE_ROLE_NAME);
                 returnValue = false;
diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateCommand.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateCommand.java
index 16472bc..f38a505 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateCommand.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/VmTemplateCommand.java
@@ -5,6 +5,7 @@
 import java.util.List;
 import java.util.Map;
 
+import org.apache.commons.lang.StringUtils;
 import org.ovirt.engine.core.bll.utils.PermissionSubject;
 import org.ovirt.engine.core.bll.validator.StorageDomainValidator;
 import org.ovirt.engine.core.common.VdcObjectType;
@@ -23,7 +24,6 @@
 import org.ovirt.engine.core.common.queries.VdcQueryType;
 import org.ovirt.engine.core.compat.Guid;
 import org.ovirt.engine.core.compat.NotImplementedException;
-import org.ovirt.engine.core.compat.StringHelper;
 import org.ovirt.engine.core.dal.VdcBllMessages;
 import org.ovirt.engine.core.dal.dbbroker.DbFacade;
 
@@ -133,7 +133,7 @@
     public static boolean IsDomainLegal(String domainName, 
java.util.ArrayList<String> reasons) {
         boolean result = true;
         char[] illegalChars = new char[] { '&' };
-        if (!StringHelper.isNullOrEmpty(domainName)) {
+        if (StringUtils.isNotEmpty(domainName)) {
             for (char c : illegalChars) {
                 if (domainName.contains((Character.toString(c)))) {
                     result = false;


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: Ie7daf463174660d063a9da2c7bbf20b4ad2389ec
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Allon Mureinik <[email protected]>
_______________________________________________
Engine-patches mailing list
[email protected]
http://lists.ovirt.org/mailman/listinfo/engine-patches

Reply via email to