Laszlo Hornyak has uploaded a new change for review.
Change subject: engine: hashcode method simplification (1/2) [wip]
......................................................................
engine: hashcode method simplification (1/2) [wip]
Adds a utility method to calculate hashcode of an object that may be
null.
Change-Id: I2ad4e8f2e57728b97f0f72aa87c199b00fa242f6
Signed-off-by: Laszlo Hornyak <lhorn...@redhat.com>
---
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatistics.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/ObjectUtils.java
2 files changed, 22 insertions(+), 14 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/85/13385/1
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatistics.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatistics.java
index 7e06da9..a744945 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatistics.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatistics.java
@@ -50,20 +50,20 @@
public int hashCode() {
final int prime = 31;
int result = 1;
- result = prime * result + ((id == null) ? 0 : id.hashCode());
- result = prime * result + ((cpu_idle == null) ? 0 :
cpu_idle.hashCode());
- result = prime * result + ((cpu_load == null) ? 0 :
cpu_load.hashCode());
- result = prime * result + ((cpu_sys == null) ? 0 : cpu_sys.hashCode());
- result = prime * result + ((cpu_user == null) ? 0 :
cpu_user.hashCode());
- result = prime * result + ((mem_available == null) ? 0 :
mem_available.hashCode());
- result = prime * result + ((mem_shared == null) ? 0 :
mem_shared.hashCode());
- result = prime * result + ((usage_cpu_percent == null) ? 0 :
usage_cpu_percent.hashCode());
- result = prime * result + ((usage_network_percent == null) ? 0 :
usage_network_percent.hashCode());
- result = prime * result + ((ksm_state == null) ? 0 :
ksm_state.hashCode());
- result = prime * result + ((ksm_pages == null) ? 0 :
ksm_pages.hashCode());
- result = prime * result + ((ksm_cpu_percent == null) ? 0 :
ksm_cpu_percent.hashCode());
- result = prime * result + ((swap_total == null) ? 0 :
swap_total.hashCode());
- result = prime * result + ((swap_free == null) ? 0 :
swap_free.hashCode());
+ result = prime * result + ObjectUtils.hashOrZero(id);
+ result = prime * result + ObjectUtils.hashOrZero(cpu_idle);
+ result = prime * result + ObjectUtils.hashOrZero(cpu_load);
+ result = prime * result + ObjectUtils.hashOrZero(cpu_sys);
+ result = prime * result + ObjectUtils.hashOrZero(cpu_user);
+ result = prime * result + ObjectUtils.hashOrZero(mem_available);
+ result = prime * result + ObjectUtils.hashOrZero(mem_shared);
+ result = prime * result + ObjectUtils.hashOrZero(usage_cpu_percent);
+ result = prime * result +
ObjectUtils.hashOrZero(usage_network_percent);
+ result = prime * result + ObjectUtils.hashOrZero(ksm_state);
+ result = prime * result + ObjectUtils.hashOrZero(ksm_pages);
+ result = prime * result + ObjectUtils.hashOrZero(ksm_cpu_percent);
+ result = prime * result + ObjectUtils.hashOrZero(swap_total);
+ result = prime * result + ObjectUtils.hashOrZero(swap_free);
return result;
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/ObjectUtils.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/ObjectUtils.java
index 5ccc7ee..4d274b4 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/ObjectUtils.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/utils/ObjectUtils.java
@@ -22,4 +22,12 @@
return bd1 == bd2 || bd1 != null && bd2 != null && bd1.compareTo(bd2)
== 0;
}
+ public static int hashOrZero(Object obj) {
+ if(obj == null) {
+ return 0;
+ } else {
+ return obj.hashCode();
+ }
+ }
+
}
--
To view, visit http://gerrit.ovirt.org/13385
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I2ad4e8f2e57728b97f0f72aa87c199b00fa242f6
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Laszlo Hornyak <lhorn...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
