Allon Mureinik has uploaded a new change for review. Change subject: core: Don't use EqOp on constants in commons ......................................................................
core: Don't use EqOp on constants in commons This patch removes the usage on StringHelper.EqOp for string constants from the commons package, and replaces them with the standard JDK string equality checks such as equals and equalsIgnoreCase. Note that the EqOp is just redundant in these cases, since a string constant is known not to be null. Change-Id: Id0936f213025c76b8c34df6d447e8067500a9887 Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdsOperationActionParameters.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/FenceStatusReturnValue.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageServerConnections.java 3 files changed, 3 insertions(+), 5 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/39/11639/1 diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdsOperationActionParameters.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdsOperationActionParameters.java index 801098e..309cc88 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdsOperationActionParameters.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/VdsOperationActionParameters.java @@ -4,7 +4,6 @@ import org.ovirt.engine.core.common.businessentities.VDS; import org.ovirt.engine.core.common.businessentities.VdsStatic; -import org.ovirt.engine.core.compat.StringHelper; public class VdsOperationActionParameters extends VdsActionParameters { private static final long serialVersionUID = 4156122527623908516L; @@ -23,7 +22,7 @@ public VdsOperationActionParameters(VdsStatic vdsStatic, String rootPassword) { super(vdsStatic.getId()); - if (StringHelper.EqOp(vdsStatic.getManagmentIp(), "")) { + if ("".equals(vdsStatic.getManagmentIp())) { vdsStatic.setManagmentIp(null); } _vdsStatic = vdsStatic; diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/FenceStatusReturnValue.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/FenceStatusReturnValue.java index a8d0d45..4965bcb 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/FenceStatusReturnValue.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/FenceStatusReturnValue.java @@ -22,7 +22,7 @@ private String _message; public String getMessage() { - return (StringHelper.EqOp(_message.toLowerCase(), "done")) ? "" : _message; + return ("done".equalsIgnoreCase(_message.toLowerCase())) ? "" : _message; } public boolean getIsSucceeded() { diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageServerConnections.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageServerConnections.java index 67b6904..4749a38 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageServerConnections.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageServerConnections.java @@ -186,8 +186,7 @@ public boolean equals(Object obj) { boolean returnValue = super.equals(obj); if (!returnValue && obj != null && obj instanceof StorageServerConnections) { - returnValue = (!StringHelper.EqOp(getid(), "") && StringHelper.EqOp(getid(), - ((StorageServerConnections) obj).getid())); + returnValue = (!"".equals(getid()) && StringHelper.EqOp(getid(), ((StorageServerConnections) obj).getid())); } return returnValue; } -- To view, visit http://gerrit.ovirt.org/11639 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Id0936f213025c76b8c34df6d447e8067500a9887 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
