Laszlo Hornyak has submitted this change and it was merged. Change subject: core: simplify businessentity equals() methods [part 1] ...................................................................... core: simplify businessentity equals() methods [part 1] Instead of manually doing a null-safe comparison for each business entity, use ObjectUtils.objectsEqual(). Where applicable, optimize the order of comparison by looking at the id field first. The resulting code is more concise, easier to maintain, and doesn't mask errors due to missing braces like the previous code did. Change-Id: Ie9531a453a352619e8a6243ea1a5e4d0de4d1a45 Signed-off-by: Greg Padgett <gpadgett(a)redhat.com&gt; --- M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ActionVersionMap.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AsyncTasks.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AuditLog.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/BaseDisk.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Bookmark.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/BusinessEntitySnapshot.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbUser.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Disk.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImage.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImageDynamic.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskLunMap.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskLunMapId.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Image.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ImageStorageDomainMapId.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/event_notification_hist.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/event_subscriber.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/event_subscriber_id.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/image_storage_domain_map.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/image_vm_map.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/image_vm_map_id.java 20 files changed, 227 insertions(+), 596 deletions(-) Approvals: Laszlo Hornyak: Verified; Looks good to me, approved -- To view, visit http://gerrit.ovirt.org/12342 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: merged Gerrit-Change-Id: Ie9531a453a352619e8a6243ea1a5e4d0de4d1a45 Gerrit-PatchSet: 2 Gerrit-Project: ovirt-engine Gerrit-Branch: master Gerrit-Owner: Greg Padgett <gpadgett(a)redhat.com&gt; Gerrit-Reviewer: Allon Mureinik <amureini(a)redhat.com&gt; Gerrit-Reviewer: Doron Fediuck <dfediuck(a)redhat.com&gt; Gerrit-Reviewer: Gilad Chaplik <gchaplik(a)redhat.com&gt; Gerrit-Reviewer: Greg Padgett <gpadgett(a)redhat.com&gt; Gerrit-Reviewer: Laszlo Hornyak <lhornyak(a)redhat.com&gt; Gerrit-Reviewer: Yair Zaslavsky <yzaslavs(a)redhat.com&gt; Gerrit-Reviewer: ofri masad <omasad(a)redhat.com&gt;