Allon Mureinik has uploaded a new change for review. Change subject: engine: Remove null check before instanceof ......................................................................
engine: Remove null check before instanceof The instanceof operator returns false for null, so it's redundant to explicitly check for nulls when using it. Explicitly checking for nulls is both slower and more confusing to read. Change-Id: If52a9ff6528dcf6fdc0a1075b5dd9ad9f43f921f Signed-off-by: Allon Mureinik <[email protected]> --- M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/QueriesCommandBase.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromPoolRunner.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapAuthenticateUserCommand.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerBrokerImpl.java M backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerDiscoveryResult.java M backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/customprop/ValidationError.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaModel.java M frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/SubnetMaskValidation.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/basic/AbstractDynamicImage.java M frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/column/VmImageColumn.java 10 files changed, 12 insertions(+), 14 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/57/18657/1 diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/QueriesCommandBase.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/QueriesCommandBase.java index cc8d817..a71d606 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/QueriesCommandBase.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/QueriesCommandBase.java @@ -66,7 +66,7 @@ } catch (RuntimeException ex) { returnValue.setSucceeded(false); Throwable th = ex instanceof VdcBLLException ? ex : ex.getCause(); - if (th != null && th instanceof VdcBLLException) { + if (th instanceof VdcBLLException) { VdcBLLException vdcExc = (VdcBLLException) th; if (vdcExc.getErrorCode() != null) { returnValue.setExceptionString(vdcExc.getErrorCode().toString()); diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromPoolRunner.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromPoolRunner.java index e8c7a27..96cfd11 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromPoolRunner.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/RemoveVmFromPoolRunner.java @@ -64,7 +64,7 @@ List<VdcActionParametersBase> parameters = getParameters(); if (parameters != null && parameters.size() != 0) { VdcActionParametersBase param = parameters.get(0); - if (param != null && param instanceof RemoveVmFromPoolParameters) { + if (param instanceof RemoveVmFromPoolParameters) { return ((RemoveVmFromPoolParameters) param); } } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapAuthenticateUserCommand.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapAuthenticateUserCommand.java index 6bd80b3..46ccc18 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapAuthenticateUserCommand.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/adbroker/LdapAuthenticateUserCommand.java @@ -90,7 +90,7 @@ private UserAuthenticationResult handleDirectorySearcherException(Exception ex) { UserAuthenticationResult authResult = null; VdcBllMessages errorMsg = VdcBllMessages.USER_FAILED_TO_AUTHENTICATE; - if (ex != null && ex instanceof AuthenticationResultException) { + if (ex instanceof AuthenticationResultException) { AuthenticationResultException authResultException = (AuthenticationResultException) ex; AuthenticationResult result = authResultException.getResult(); if (result == null) { diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerBrokerImpl.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerBrokerImpl.java index d1f4a1a..90db4e7 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerBrokerImpl.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerBrokerImpl.java @@ -64,7 +64,6 @@ return retValue; } - @Override public List<Guid> runFilters(List<String> filterNames, List<Guid> hostIDs, @@ -104,7 +103,7 @@ } private List<Guid> parseFilterResults(Object result) { - if (result == null || !(result instanceof Object[])) { + if (!(result instanceof Object[])) { log.error("External scheduler error, malformed filter results"); return null; } @@ -161,7 +160,7 @@ } private List<Pair<Guid, Integer>> parseScoreResults(Object result) { - if (result == null || !(result instanceof Object[])) { + if (!(result instanceof Object[])) { log.error("External scheduler error, malformed score results"); return null; } @@ -215,7 +214,7 @@ } private Pair<List<Guid>, Guid> parseBalanceResults(Object result) { - if (result == null || !(result instanceof Object[])) { + if (!(result instanceof Object[])) { log.error("External scheduler error, malformed balance results"); return null; } diff --git a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerDiscoveryResult.java b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerDiscoveryResult.java index ca010ec..ced2d80 100644 --- a/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerDiscoveryResult.java +++ b/backend/manager/modules/bll/src/main/java/org/ovirt/engine/core/bll/scheduling/external/ExternalSchedulerDiscoveryResult.java @@ -27,7 +27,7 @@ public boolean populate(Object xmlRpcRawResult) { try { - if (xmlRpcRawResult == null || !(xmlRpcRawResult instanceof HashMap)) { + if (!(xmlRpcRawResult instanceof HashMap)) { log.error("External scheduler error, malformed discover results"); return false; } diff --git a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/customprop/ValidationError.java b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/customprop/ValidationError.java index 3f803ae..b82a8fc 100644 --- a/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/customprop/ValidationError.java +++ b/backend/manager/modules/utils/src/main/java/org/ovirt/engine/core/utils/customprop/ValidationError.java @@ -43,7 +43,7 @@ @Override public boolean equals(Object other) { - if (other != null && other instanceof ValidationError) { + if (other instanceof ValidationError) { ValidationError otherError = (ValidationError) other; return keyName.equals(otherError.getKeyName()) && reason == otherError.getReason(); } diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaModel.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaModel.java index 3f4fe45..613dda8 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaModel.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/models/quota/QuotaModel.java @@ -459,7 +459,7 @@ if (entity instanceof Integer) { return (Integer) entity; } - if (entity == null || !(entity instanceof String)) { + if (!(entity instanceof String)) { return null; } String text = (String) entity; diff --git a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/SubnetMaskValidation.java b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/SubnetMaskValidation.java index 3ef892c..85d089e 100644 --- a/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/SubnetMaskValidation.java +++ b/frontend/webadmin/modules/uicommonweb/src/main/java/org/ovirt/engine/ui/uicommonweb/validation/SubnetMaskValidation.java @@ -36,7 +36,7 @@ } ValidationResult result = new ValidationResult(); - if (value != null && value instanceof String) { + if (value instanceof String) { result.setSuccess(validateNetMask((String) value)); result.setReasons(reasons); } diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/basic/AbstractDynamicImage.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/basic/AbstractDynamicImage.java index daf7936..9f1b878 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/basic/AbstractDynamicImage.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/basic/AbstractDynamicImage.java @@ -45,7 +45,7 @@ private ImageResource getImage(T value) { ResourcePrototype resource = resources.getResource(imageName(value)); - if (resource == null || !(resource instanceof ImageResource)) { + if (!(resource instanceof ImageResource)) { return (ImageResource) resources.getResource(defaultImageName(value)); } diff --git a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/column/VmImageColumn.java b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/column/VmImageColumn.java index c074299..9e6b963 100644 --- a/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/column/VmImageColumn.java +++ b/frontend/webadmin/modules/userportal-gwtp/src/main/java/org/ovirt/engine/ui/userportal/widget/table/column/VmImageColumn.java @@ -1,6 +1,5 @@ package org.ovirt.engine.ui.userportal.widget.table.column; - import org.ovirt.engine.ui.uicommonweb.dataprovider.AsyncDataProvider; import com.google.gwt.resources.client.ImageResource; @@ -24,7 +23,7 @@ String osTypeName = AsyncDataProvider.getOsUniqueOsNames().get(extractor.extractOsType(item)); ResourcePrototype resource = getApplicationResourcesWithLookup().getResource(osTypeName + "SmallImage"); //$NON-NLS-1$ - if (resource == null || !(resource instanceof ImageResource)) { + if (!(resource instanceof ImageResource)) { resource = getApplicationResourcesWithLookup().otherSmallImage(); } -- To view, visit http://gerrit.ovirt.org/18657 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: If52a9ff6528dcf6fdc0a1075b5dd9ad9f43f921f 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
