[Engine-patches] Change in ovirt-engine[master]: core: Remove deprecated StringHelper in EventSubscriptionCom...

[Sharad Mishra]

Sharad Mishra has uploaded a new change for review.

Change subject: core: Remove deprecated StringHelper in 
EventSubscriptionCommandBase.
......................................................................

core: Remove deprecated StringHelper in EventSubscriptionCommandBase.

Replaced StringHelper with StringUtils

Change-Id: I04ea2ca3a7bec54108353944b1864b32e3ee34f5
Signed-off-by: Sharad Mishra <snmis...@linux.vnet.ibm.com>
---
M 
backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/EventSubscriptionCommandBase.java
1 file changed, 6 insertions(+), 6 deletions(-)


  git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/71/7271/1

diff --git 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/EventSubscriptionCommandBase.java
 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/EventSubscriptionCommandBase.java
index 6ae5f17..7424f4e 100644
--- 
a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/EventSubscriptionCommandBase.java
+++ 
b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/EventSubscriptionCommandBase.java
@@ -2,6 +2,7 @@
 
 import java.util.List;
 
+import org.apache.commons.lang.StringUtils;
 import org.ovirt.engine.core.common.EventNotificationMethods;
 import org.ovirt.engine.core.common.action.EventSubscriptionParametesBase;
 import org.ovirt.engine.core.common.businessentities.DbUser;
@@ -9,7 +10,6 @@
 import org.ovirt.engine.core.common.businessentities.event_subscriber;
 import org.ovirt.engine.core.common.businessentities.tags;
 import org.ovirt.engine.core.compat.Regex;
-import org.ovirt.engine.core.compat.StringHelper;
 import org.ovirt.engine.core.dal.VdcBllMessages;
 import org.ovirt.engine.core.dal.dbbroker.DbFacade;
 
@@ -37,10 +37,10 @@
 
         switch (notificationMethod) {
         case EMAIL:
-            String mailAdress = 
(StringHelper.isNullOrEmpty(event_subscriber.getmethod_address())) ? 
user.getemail()
+            String mailAdress = 
(StringUtils.isEmpty(event_subscriber.getmethod_address())) ? user.getemail()
                     : event_subscriber.getmethod_address();
 
-            if (StringHelper.isNullOrEmpty(mailAdress) || 
!ValidatMailAddress(mailAdress)) {
+            if (StringUtils.isEmpty(mailAdress) || 
!ValidatMailAddress(mailAdress)) {
                 
addCanDoActionMessage(VdcBllMessages.USER_DOES_NOT_HAVE_A_VALID_EMAIL);
                 retValue = false;
             }
@@ -71,7 +71,7 @@
         boolean retValue = 
ValidateNotificationMethod(event_notification_methods, event_subscriber, user);
 
         // validate tag name if exists
-        if (retValue && !StringHelper.isNullOrEmpty(tagName)) {
+        if (retValue && StringUtils.isNotEmpty(tagName)) {
             retValue = ValidateTag(tagName);
         }
         return retValue;
@@ -95,7 +95,7 @@
                 retValue = 
ValidateNotificationMethod(event_notification_methods, event_subscriber, user);
 
                 // validate tag name if exists
-                if (retValue && !StringHelper.isNullOrEmpty(tagName)) {
+                if (retValue && StringUtils.isNotEmpty(tagName)) {
                     retValue = ValidateTag(tagName);
                 }
             }
@@ -140,7 +140,7 @@
         boolean retValue = false;
         for (event_subscriber event_subscriber : subscriptions) {
             if 
(event_subscriber.getsubscriber_id().equals(current.getsubscriber_id())
-                    && StringHelper.EqOp(event_subscriber.getevent_up_name(), 
current.getevent_up_name())
+                    && StringUtils.equals(event_subscriber.getevent_up_name(), 
current.getevent_up_name())
                     && event_subscriber.getmethod_id() == 
current.getmethod_id()) {
                 retValue = true;
                 break;


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

Gerrit-MessageType: newchange
Gerrit-Change-Id: I04ea2ca3a7bec54108353944b1864b32e3ee34f5
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