Shahar Havivi has uploaded a new change for review. Change subject: findbugs: Redundant nullcheck of value known to be non null ......................................................................
findbugs: Redundant nullcheck of value known to be non null findbugs reason: RCN: Redundant nullcheck of value known to be non-null Change-Id: Iba61834fecf74eabdcabd8f120b184430038c8c6 Signed-off-by: Shahar Havivi <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddPermissionCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/job/ExecutionHandler.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResource.java M backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDomainsResource.java M backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java M backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/LoginModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java M frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/NullableButtonCell.java 10 files changed, 33 insertions(+), 38 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/76/14976/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddPermissionCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddPermissionCommand.java index 22ffebc..0d4fcb9 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddPermissionCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/AddPermissionCommand.java @@ -59,8 +59,7 @@ } // if user and group not sent check user/group is in the db in order to // give permission - if (adElementId != null - && getParameters().getVdcUser() == null + if (getParameters().getVdcUser() == null && getParameters().getAdGroup() == null && getDbUserDAO().get(adElementId) == null && getAdGroupDAO().get(adElementId) == null) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java index 20e637e..5353e56 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/UpdateVmTemplateCommand.java @@ -51,30 +51,29 @@ if (mOldTemplate == null) { return failCanDoAction(VdcBllMessages.ACTION_TYPE_FAILED_TEMPLATE_DOES_NOT_EXIST); } - if (mOldTemplate != null) { - VmTemplateHandler.UpdateDisksFromDb(mOldTemplate); - if (mOldTemplate.getStatus() == VmTemplateStatus.Locked) { - return failCanDoAction(VdcBllMessages.VM_TEMPLATE_IS_LOCKED); - } - if (!StringUtils.equals(mOldTemplate.getName(), getVmTemplate().getName()) - && isVmTemlateWithSameNameExist(getVmTemplateName())) { - addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_NAME_ALREADY_USED); - } else { - if (getVdsGroup() == null) { - addCanDoActionMessage(VdcBllMessages.VMT_CLUSTER_IS_NOT_VALID); - } else if (VmHandler.isMemorySizeLegal(mOldTemplate.getOs(), - mOldTemplate.getMemSizeMb(), - getReturnValue() - .getCanDoActionMessages(), - getVdsGroup().getcompatibility_version().toString())) { - if (IsVmPriorityValueLegal(getParameters().getVmTemplateData().getPriority(), getReturnValue() - .getCanDoActionMessages()) - && IsDomainLegal(getParameters().getVmTemplateData().getDomain(), getReturnValue() - .getCanDoActionMessages())) { - returnValue = VmTemplateHandler.isUpdateValid(mOldTemplate, getVmTemplate()); - if (!returnValue) { - addCanDoActionMessage(VdcBllMessages.VMT_CANNOT_UPDATE_ILLEGAL_FIELD); - } + + VmTemplateHandler.UpdateDisksFromDb(mOldTemplate); + if (mOldTemplate.getStatus() == VmTemplateStatus.Locked) { + return failCanDoAction(VdcBllMessages.VM_TEMPLATE_IS_LOCKED); + } + if (!StringUtils.equals(mOldTemplate.getName(), getVmTemplate().getName()) + && isVmTemlateWithSameNameExist(getVmTemplateName())) { + addCanDoActionMessage(VdcBllMessages.ACTION_TYPE_FAILED_NAME_ALREADY_USED); + } else { + if (getVdsGroup() == null) { + addCanDoActionMessage(VdcBllMessages.VMT_CLUSTER_IS_NOT_VALID); + } else if (VmHandler.isMemorySizeLegal(mOldTemplate.getOs(), + mOldTemplate.getMemSizeMb(), + getReturnValue() + .getCanDoActionMessages(), + getVdsGroup().getcompatibility_version().toString())) { + if (IsVmPriorityValueLegal(getParameters().getVmTemplateData().getPriority(), getReturnValue() + .getCanDoActionMessages()) + && IsDomainLegal(getParameters().getVmTemplateData().getDomain(), getReturnValue() + .getCanDoActionMessages())) { + returnValue = VmTemplateHandler.isUpdateValid(mOldTemplate, getVmTemplate()); + if (!returnValue) { + addCanDoActionMessage(VdcBllMessages.VMT_CANNOT_UPDATE_ILLEGAL_FIELD); } } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/job/ExecutionHandler.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/job/ExecutionHandler.java index fd83b16..756a047 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/job/ExecutionHandler.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/job/ExecutionHandler.java @@ -293,7 +293,7 @@ } Step step = null; - if (context != null && context.isTasksMonitored()) { + if (context.isTasksMonitored()) { Step parentTaskStep = context.getParentTasksStep(); if (parentTaskStep != null) { step = addSubStep(parentTaskStep, stepName, description); @@ -358,7 +358,7 @@ step = parentStep.addStep(newStepName, description); } } - } else if (parentStep != null && context.getExecutionMethod() == ExecutionMethod.AsStep) { + } else if (context.getExecutionMethod() == ExecutionMethod.AsStep) { step = parentStep.addStep(newStepName, description); } } diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResource.java index 40d760e..fb050d1 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendCapabilitiesResource.java @@ -255,7 +255,7 @@ public String generateId(Version v) { NGuid guid = new NGuid((v.getMajor()+"."+v.getMinor()).getBytes(),true); - return guid!=null ? guid.toString():null; + return guid.toString(); } private void addNetworkUsages(VersionCaps version, NetworkUsage[] values) { diff --git a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDomainsResource.java b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDomainsResource.java index 90da627..0d3e977 100644 --- a/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDomainsResource.java +++ b/backend/manager/modules/restapi/jaxrs/src/main/java/org/ovirt/engine/api/restapi/resource/BackendDomainsResource.java @@ -52,7 +52,7 @@ Directory ds = new Directory(); ds.setDomain(domain); NGuid guid = new NGuid(domain.getBytes(),true); - ds.setId(guid!=null?guid.toString():null); + ds.setId(guid.toString()); dsl.add(ds); } return dsl; diff --git a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java index de87d65..bb798c9 100644 --- a/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java +++ b/backend/manager/modules/restapi/types/src/main/java/org/ovirt/engine/api/restapi/types/HostMapper.java @@ -490,7 +490,7 @@ private static void setHookId(Hook hook, String hookName, String eventName, String md5) { NGuid guid = generateHookId(eventName, hookName, md5); - hook.setId(guid != null ? guid.toString() : null); + hook.setId(guid.toString()); } public static NGuid generateHookId(String eventName, String hookName, String md5) { diff --git a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java index 34c0966..06edb06 100644 --- a/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java +++ b/backend/manager/modules/vdsbroker/src/main/java/org/ovirt/engine/core/vdsbroker/irsbroker/IrsBrokerCommand.java @@ -259,8 +259,7 @@ } } } - } else if (result != null - && result.getSucceeded() + } else if (result.getSucceeded() && ((SpmStatusResult) result.getReturnValue()).getSpmStatus() == SpmStatus.SPM && (storagePool.getstatus() == StoragePoolStatus.Problematic || storagePool.getstatus() == StoragePoolStatus.Contend)) { // if recovered from network exception set back to up diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/LoginModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/LoginModel.java index 776ffc0..0d2ab69 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/LoginModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/LoginModel.java @@ -258,7 +258,7 @@ if (result != null) { VdcReturnValueBase returnValue = (VdcReturnValueBase) result; - if (returnValue != null && returnValue.getSucceeded()) + if (returnValue.getSucceeded()) { user = (VdcUser) returnValue.getActionReturnValue(); loginModel.setLoggedUser(user); diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java index edcf4ac..17669e9 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/hosts/HostModel.java @@ -1152,7 +1152,7 @@ getTestCommand().setIsExecutionAllowed(true); } else { - if (response != null && response.getReturnValue() != null) { + if (response.getReturnValue() != null) { FenceStatusReturnValue fenceStatusReturnValue = (FenceStatusReturnValue) response.getReturnValue(); String message = fenceStatusReturnValue.toString(); diff --git a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/NullableButtonCell.java b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/NullableButtonCell.java index a75b1ed..fc22aea 100644 --- a/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/NullableButtonCell.java +++ b/frontend/webadmin/modules/webadmin/src/main/java/org/ovirt/engine/ui/webadmin/widget/table/column/NullableButtonCell.java @@ -10,9 +10,7 @@ public void render(com.google.gwt.cell.client.Cell.Context context, SafeHtml data, SafeHtmlBuilder sb) { if (data != null) { sb.appendHtmlConstant("<button type=\"button\" style=\"height:24px;\" tabindex=\"-1\">"); //$NON-NLS-1$ - if (data != null) { - sb.append(data); - } + sb.append(data); sb.appendHtmlConstant("</button>"); //$NON-NLS-1$ } } -- To view, visit http://gerrit.ovirt.org/14976 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: Iba61834fecf74eabdcabd8f120b184430038c8c6 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Shahar Havivi <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
