Greg Padgett has uploaded a new change for review.
Change subject: core: clean up businessentity hashCode() methods [part 2]
......................................................................
core: clean up businessentity hashCode() methods [part 2]
Organize hashCode() methods into a consistent format and consistent
ordering with equals(). This will make field-by-field comparison and
maintenance easier.
Change-Id: If925715cc91c1b4a53a7f6d212ac51043412db53
Signed-off-by: Greg Padgett <gpadg...@redhat.com>
---
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Snapshot.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomain.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainDynamic.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainStatic.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StoragePoolIsoMap.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageServerConnections.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/TagsVmMap.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/TagsVmPoolMap.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSGroup.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsDynamic.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatic.java
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/businessentities/VmBase.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDevice.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDynamic.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmPool.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatic.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatistics.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage_pool.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/tags.java
21 files changed, 108 insertions(+), 214 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/38/12538/1
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Snapshot.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Snapshot.java
index 071f53d..c677ed6 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Snapshot.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Snapshot.java
@@ -176,10 +176,10 @@
public int hashCode() {
final int prime = 31;
int result = 1;
+ result = prime * result + ((id == null) ? 0 : id.hashCode());
result = prime * result + ((appList == null) ? 0 : appList.hashCode());
result = prime * result + ((creationDate == null) ? 0 :
creationDate.hashCode());
result = prime * result + ((description == null) ? 0 :
description.hashCode());
- result = prime * result + ((id == null) ? 0 : id.hashCode());
result = prime * result + ((status == null) ? 0 : status.hashCode());
result = prime * result + ((type == null) ? 0 : type.hashCode());
result = prime * result + ((vmConfiguration == null) ? 0 :
vmConfiguration.hashCode());
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomain.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomain.java
index ce8fb18..771cdcf 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomain.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomain.java
@@ -304,24 +304,14 @@
public int hashCode() {
final int prime = 31;
int result = 1;
+ result = prime * result + ((getId() == null) ? 0 : getId().hashCode());
result = prime * result + committedDiskSize;
- result = prime * result
- + ((dynamicData == null) ? 0 : dynamicData.hashCode());
- result = prime * result
- + ((staticData == null) ? 0 : staticData.hashCode());
- result = prime
- * result
- + ((storageDomainSharedStatus == null) ? 0
- : storageDomainSharedStatus.hashCode());
+ result = prime * result + ((dynamicData == null) ? 0 :
dynamicData.hashCode());
+ result = prime * result + ((staticData == null) ? 0 :
staticData.hashCode());
+ result = prime * result + ((storageDomainSharedStatus == null) ? 0 :
storageDomainSharedStatus.hashCode());
result = prime * result + storageDomainOverCommitPercent;
- result = prime
- * result
- + ((storagePoolIsoMapData == null) ? 0
- : storagePoolIsoMapData.hashCode());
- result = prime * result
- + ((totalDiskSize == null) ? 0 : totalDiskSize.hashCode());
- result = prime * result
- + ((getId() == null) ? 0 : getId().hashCode());
+ result = prime * result + ((storagePoolIsoMapData == null) ? 0 :
storagePoolIsoMapData.hashCode());
+ result = prime * result + ((totalDiskSize == null) ? 0 :
totalDiskSize.hashCode());
return result;
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainDynamic.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainDynamic.java
index 31bf8a3..7c5c0c7 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainDynamic.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainDynamic.java
@@ -71,8 +71,8 @@
public int hashCode() {
final int prime = 31;
int result = 1;
- result = prime * result + ((availableDiskSize == null) ? 0 :
availableDiskSize.hashCode());
result = prime * result + ((id == null) ? 0 : id.hashCode());
+ result = prime * result + ((availableDiskSize == null) ? 0 :
availableDiskSize.hashCode());
result = prime * result + ((usedDiskSize == null) ? 0 :
usedDiskSize.hashCode());
return result;
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainStatic.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainStatic.java
index f39311c..8fdffb7 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainStatic.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainStatic.java
@@ -148,9 +148,9 @@
public int hashCode() {
final int prime = 31;
int result = 1;
- result = prime * result + (autoRecoverable ? 1231 : 1237);
- result = prime * result + ((connection == null) ? 0 :
connection.hashCode());
result = prime * result + ((id == null) ? 0 : id.hashCode());
+ result = prime * result + (autoRecoverable ? 0 : 1);
+ result = prime * result + ((connection == null) ? 0 :
connection.hashCode());
result = prime * result + ((name == null) ? 0 : name.hashCode());
result = prime * result + ((storage == null) ? 0 : storage.hashCode());
result = prime * result + ((storageFormat == null) ? 0 :
storageFormat.hashCode());
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StoragePoolIsoMap.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StoragePoolIsoMap.java
index 34e17c6..85edf97 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StoragePoolIsoMap.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StoragePoolIsoMap.java
@@ -85,9 +85,8 @@
int result = 1;
result = prime * result + ((id == null) ? 0 : id.hashCode());
result = prime * result + ((persistentOwner == null) ? 0 :
persistentOwner.hashCode());
- result =
- prime * result
- + ((persistentStorageDomainStatus == null) ? 0 :
persistentStorageDomainStatus.hashCode());
+ result = prime * result
+ + ((persistentStorageDomainStatus == null) ? 0 :
persistentStorageDomainStatus.hashCode());
return result;
}
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 4422fba..8fbcb26 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
@@ -192,7 +192,10 @@
@Override
public int hashCode() {
- return getid() != null ? getid().hashCode() : 0;
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((getid() == null) ? 0 : getid().hashCode());
+ return result;
}
public static StorageServerConnections copyOf(StorageServerConnections
ssc) {
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/TagsVmMap.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/TagsVmMap.java
index c508ecb..7be0c19 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/TagsVmMap.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/TagsVmMap.java
@@ -48,9 +48,9 @@
public int hashCode() {
final int prime = 31;
int result = 1;
- result = prime * result + ((defaultDisplayType == null) ? 0 :
defaultDisplayType.hashCode());
result = prime * result + ((id.tagId == null) ? 0 :
id.tagId.hashCode());
result = prime * result + ((id.vmId == null) ? 0 : id.vmId.hashCode());
+ result = prime * result + ((defaultDisplayType == null) ? 0 :
defaultDisplayType.hashCode());
return result;
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/TagsVmPoolMap.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/TagsVmPoolMap.java
index b8a230b..45f6c50 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/TagsVmPoolMap.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/TagsVmPoolMap.java
@@ -41,8 +41,8 @@
public int hashCode() {
final int prime = 31;
int result = 1;
- result = prime * result + ((created == null) ? 0 : created.hashCode());
result = prime * result + ((id == null) ? 0 : id.hashCode());
+ result = prime * result + ((created == null) ? 0 : created.hashCode());
return result;
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java
index 93ce424..9e71493 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDS.java
@@ -38,6 +38,9 @@
public int hashCode() {
final int prime = 31;
int result = 1;
+ result = prime * result + ((mVdsStatic == null) ? 0 :
mVdsStatic.hashCode());
+ result = prime * result + ((mVdsDynamic == null) ? 0 :
mVdsDynamic.hashCode());
+ result = prime * result + ((mVdsStatistics == null) ? 0 :
mVdsStatistics.hashCode());
result = prime * result + ((cpuName == null) ? 0 : cpuName.hashCode());
result = prime * result + ((_spm_status == null) ? 0 :
_spm_status.hashCode());
result = prime * result + cpuOverCommitDurationMinutes;
@@ -47,20 +50,14 @@
result = prime * result + ((mImagesLastDelay == null) ? 0 :
mImagesLastDelay.hashCode());
result = prime * result + ((mInterfaceList == null) ? 0 :
mInterfaceList.hashCode());
result = prime * result + ((mNetworkList == null) ? 0 :
mNetworkList.hashCode());
- result = prime * result + ((mVdsDynamic == null) ? 0 :
mVdsDynamic.hashCode());
- result = prime * result + ((mVdsStatic == null) ? 0 :
mVdsStatic.hashCode());
- result = prime * result + ((mVdsStatistics == null) ? 0 :
mVdsStatistics.hashCode());
result = prime * result + maxVdsMemoryOverCommit;
result = prime * result + ((privateDomains == null) ? 0 :
privateDomains.hashCode());
result = prime * result + ((vdsSpmId == null) ? 0 :
vdsSpmId.hashCode());
result = prime * result + ((selectionAlgorithm == null) ? 0 :
selectionAlgorithm.hashCode());
result = prime * result + ((storagePoolId == null) ? 0 :
storagePoolId.hashCode());
result = prime * result + ((storagePoolName == null) ? 0 :
storagePoolName.hashCode());
- result =
- prime
- * result
- + ((vdsGroupCompatibilityVersion == null) ? 0
- : vdsGroupCompatibilityVersion.hashCode());
+ result = prime * result
+ + ((vdsGroupCompatibilityVersion == null) ? 0 :
vdsGroupCompatibilityVersion.hashCode());
result = prime * result + ((vdsGroupCpuName == null) ? 0 :
vdsGroupCpuName.hashCode());
result = prime * result + ((vdsGroupDescription == null) ? 0 :
vdsGroupDescription.hashCode());
result = prime * result + ((vdsGroupName == null) ? 0 :
vdsGroupName.hashCode());
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSGroup.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSGroup.java
index 5dd7690..b429f1b 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSGroup.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VDSGroup.java
@@ -247,16 +247,13 @@
public int hashCode() {
final int prime = 31;
int result = 1;
+ result = prime * result + ((id == null) ? 0 : id.hashCode());
result = prime * result + ((compatVersion == null) ? 0 :
compatVersion.hashCode());
result = prime * result + ((compatibility_version == null) ? 0 :
compatibility_version.hashCode());
result = prime * result + ((cpu_name == null) ? 0 :
cpu_name.hashCode());
- result =
- prime
- * result
- + cpu_over_commit_duration_minutes;
+ result = prime * result + cpu_over_commit_duration_minutes;
result = prime * result + ((description == null) ? 0 :
description.hashCode());
result = prime * result + high_utilization;
- result = prime * result + ((id == null) ? 0 : id.hashCode());
result = prime * result + low_utilization;
result = prime * result + max_vds_memory_over_commit;
result = prime * result + (countThreadsAsCores ? 1231 : 1237);
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsDynamic.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsDynamic.java
index c7a442c..78229f4 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsDynamic.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsDynamic.java
@@ -573,8 +573,8 @@
public int hashCode() {
final int prime = 31;
int result = 1;
- result =
- prime * result + ((_supportedClusterVersionsSet == null) ? 0 :
_supportedClusterVersionsSet.hashCode());
+ result = prime * result + ((id == null) ? 0 : id.hashCode());
+ result = prime * result + ((_supportedClusterVersionsSet == null) ? 0
: _supportedClusterVersionsSet.hashCode());
result = prime * result + ((_supportedENGINESVersionsSet == null) ? 0
: _supportedENGINESVersionsSet.hashCode());
result = prime * result + anonymousHugePages;
result = prime * result + ((buildName == null) ? 0 :
buildName.hashCode());
@@ -589,7 +589,6 @@
result = prime * result + ((hooksStr == null) ? 0 :
hooksStr.hashCode());
result = prime * result + ((host_os == null) ? 0 : host_os.hashCode());
result = prime * result + ((iScsiInitiatorName == null) ? 0 :
iScsiInitiatorName.hashCode());
- result = prime * result + ((id == null) ? 0 : id.hashCode());
result = prime * result + ((if_total_speed == null) ? 0 :
if_total_speed.hashCode());
result = prime * result + ((kernel_version == null) ? 0 :
kernel_version.hashCode());
result = prime * result + ((kvm_enabled == null) ? 0 :
kvm_enabled.hashCode());
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatic.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatic.java
index 2bea853..b8ecffd 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatic.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VdsStatic.java
@@ -475,9 +475,9 @@
public int hashCode() {
final int prime = 31;
int result = 1;
+ result = prime * result + ((id == null) ? 0 : id.hashCode());
result = prime * result + ((hostname == null) ? 0 :
hostname.hashCode());
result = prime * result + ((consoleAddress == null) ? 0 :
consoleAddress.hashCode());
- result = prime * result + ((id == null) ? 0 : id.hashCode());
result = prime * result + ((managementIp == null) ? 0 :
managementIp.hashCode());
result = prime * result + ((name == null) ? 0 : name.hashCode());
result = prime * result + (int) (otpValidity ^ (otpValidity >>> 32));
@@ -530,13 +530,6 @@
&& ObjectUtils.objectsEqual(pmPort, other.pmPort)
&& ObjectUtils.objectsEqual(pmType, other.pmType)
&& ObjectUtils.objectsEqual(pmUser, other.pmUser)
- && port == other.port
- && ObjectUtils.objectsEqual(serverSslEnabled,
other.serverSslEnabled)
- && ObjectUtils.objectsEqual(uniqueId, other.uniqueId)
- && ObjectUtils.objectsEqual(vdsGroupId, other.vdsGroupId)
- && ObjectUtils.objectsEqual(vdsStrength, other.vdsStrength)
- && vdsType == other.vdsType
- && ObjectUtils.objectsEqual(sshKeyFingerprint,
other.sshKeyFingerprint)
&& ObjectUtils.objectsEqual(pmSecondaryIp, other.pmSecondaryIp)
&& pmSecondaryConcurrent == other.pmSecondaryConcurrent
&& ObjectUtils.objectsEqual(pmSecondaryOptions,
other.pmSecondaryOptions)
@@ -545,7 +538,13 @@
&& ObjectUtils.objectsEqual(pmSecondaryPort,
other.pmSecondaryPort)
&& ObjectUtils.objectsEqual(pmSecondaryType,
other.pmSecondaryType)
&& ObjectUtils.objectsEqual(pmSecondaryUser,
other.pmSecondaryUser)
- && port == other.port);
+ && port == other.port
+ && ObjectUtils.objectsEqual(serverSslEnabled,
other.serverSslEnabled)
+ && ObjectUtils.objectsEqual(uniqueId, other.uniqueId)
+ && ObjectUtils.objectsEqual(vdsGroupId, other.vdsGroupId)
+ && ObjectUtils.objectsEqual(vdsStrength, other.vdsStrength)
+ && vdsType == other.vdsType
+ && ObjectUtils.objectsEqual(sshKeyFingerprint,
other.sshKeyFingerprint));
}
}
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 5333357..becfcce 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 + ((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());
return result;
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java
index 38aa841..62d83ba 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmBase.java
@@ -550,6 +550,7 @@
public int hashCode() {
final int prime = 31;
int result = 1;
+ result = prime * result + ((id == null) ? 0 : id.hashCode());
result = prime * result + (autoStartup ? 1231 : 1237);
result = prime * result + (autoSuspend ? 1231 : 1237);
result = prime * result + cpuPerSocket;
@@ -558,7 +559,6 @@
result = prime * result + ((description == null) ? 0 :
description.hashCode());
result = prime * result + ((domain == null) ? 0 : domain.hashCode());
result = prime * result + (failBack ? 1231 : 1237);
- result = prime * result + ((id == null) ? 0 : id.hashCode());
result = prime * result + ((initrdUrl == null) ? 0 :
initrdUrl.hashCode());
result = prime * result + ((isoPath == null) ? 0 : isoPath.hashCode());
result = prime * result + ((kernelParams == null) ? 0 :
kernelParams.hashCode());
@@ -578,11 +578,10 @@
result = prime * result + ((vmType == null) ? 0 : vmType.hashCode());
result = prime * result + ((quotaId == null) ? 0 : quotaId.hashCode());
result = prime * result + (allowConsoleReconnect ? 1231 : 1237);
- result = prime * result + ((migrationSupport == null) ? 0 :
migrationSupport.hashCode());
result = prime * result + ((dedicatedVmForVds == null) ? 0 :
dedicatedVmForVds.hashCode());
+ result = prime * result + ((migrationSupport == null) ? 0 :
migrationSupport.hashCode());
result = prime * result + ((tunnelMigration == null) ? 0 :
tunnelMigration.hashCode());
result = prime * result + ((vncKeyboardLayout == null) ? 0 :
vncKeyboardLayout.hashCode());
-
return result;
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDevice.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDevice.java
index 68e7622..fab167c 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDevice.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDevice.java
@@ -205,11 +205,10 @@
result = prime * result + type.hashCode();
result = prime * result + address.hashCode();
result = prime * result + bootOrder;
- result = prime * result
- + ((specParams == null) ? 0 : specParams.hashCode());
- result = prime * result + (isManaged ? 1 : 0);
- result = prime * result + (isPlugged ? 1 : 0);
- result = prime * result + (isReadOnly ? 1 : 0);
+ result = prime * result + ((specParams == null) ? 0 :
specParams.hashCode());
+ result = prime * result + (isManaged ? 1231 : 1237);
+ result = prime * result + (isPlugged ? 1231 : 1237);
+ result = prime * result + (isReadOnly ? 1231 : 1237);
result = prime * result + alias.hashCode();
return result;
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDynamic.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDynamic.java
index 1bdf6f5..4ce971b 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDynamic.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDynamic.java
@@ -49,95 +49,39 @@
public int hashCode() {
final int prime = 31;
int result = 1;
- result = prime
- * result
- + ((acpi_enable == null) ? 0 : acpi_enable.hashCode());
- result = prime * result
- + ((appList == null) ? 0 : appList.hashCode());
- result = prime
- * result
- + boot_sequence.hashCode() * prime;
- result = prime * result
- + ((client_ip == null) ? 0 : client_ip.hashCode());
- result = prime * result
- + ((display == null) ? 0 : display.hashCode());
- result = prime * result
- + ((display_ip == null) ? 0 : display_ip.hashCode());
- result = prime
- * result
- + ((display_secure_port == null) ? 0
- : display_secure_port.hashCode());
- result = prime
- * result
- + display_type.hashCode() * prime;
- result = prime
- * result
- + ((console_cur_user_name == null) ? 0
- : console_cur_user_name.hashCode());
- result = prime
- * result
- + ((guest_cur_user_name == null) ? 0
- : guest_cur_user_name.hashCode());
- result = prime
- * result
- + ((consoleUserId == null) ? 0
- : consoleUserId.hashCode());
- result = prime
- * result
- + ((guest_last_login_time == null) ? 0
- : guest_last_login_time.hashCode());
- result = prime
- * result
- + ((guest_last_logout_time == null) ? 0
- : guest_last_logout_time.hashCode());
- result = prime * result
- + ((guest_os == null) ? 0 : guest_os.hashCode());
- result = prime
- * result
- + ((guest_requested_memory == null) ? 0
- : guest_requested_memory.hashCode());
- result = prime
- * result
- + ((hibernation_vol_handle == null) ? 0
- : hibernation_vol_handle.hashCode());
- result = prime * result
- + ((kvm_enable == null) ? 0 : kvm_enable.hashCode());
- result = prime
- * result
- + ((last_vds_run_on == null) ? 0 : last_vds_run_on
- .hashCode());
+ result = prime * result + ((id == null) ? 0 : id.hashCode());
+ result = prime * result + ((acpi_enable == null) ? 0 :
acpi_enable.hashCode());
+ result = prime * result + ((appList == null) ? 0 : appList.hashCode());
+ result = prime * result + boot_sequence.hashCode();
+ result = prime * result + ((client_ip == null) ? 0 :
client_ip.hashCode());
+ result = prime * result + ((display == null) ? 0 : display.hashCode());
+ result = prime * result + ((display_ip == null) ? 0 :
display_ip.hashCode());
+ result = prime * result + ((display_secure_port == null) ? 0 :
display_secure_port.hashCode());
+ result = prime * result + display_type.hashCode();
+ result = prime * result + ((console_cur_user_name == null) ? 0 :
console_cur_user_name.hashCode());
+ result = prime * result + ((guest_cur_user_name == null) ? 0 :
guest_cur_user_name.hashCode());
+ result = prime * result + ((consoleUserId == null) ? 0 :
consoleUserId.hashCode());
+ result = prime * result + ((guest_last_login_time == null) ? 0 :
guest_last_login_time.hashCode());
+ result = prime * result + ((guest_last_logout_time == null) ? 0 :
guest_last_logout_time.hashCode());
+ result = prime * result + ((guest_os == null) ? 0 :
guest_os.hashCode());
+ result = prime * result + ((guest_requested_memory == null) ? 0 :
guest_requested_memory.hashCode());
+ result = prime * result + ((hibernation_vol_handle == null) ? 0 :
hibernation_vol_handle.hashCode());
+ result = prime * result + ((kvm_enable == null) ? 0 :
kvm_enable.hashCode());
+ result = prime * result + ((last_vds_run_on == null) ? 0 :
last_vds_run_on.hashCode());
result = prime * result + ((mDisks == null) ? 0 : mDisks.hashCode());
- result = prime * result
- + ((mExitMessage == null) ? 0 : mExitMessage.hashCode());
- result = prime * result
- + mExitStatus.hashCode() * prime;
+ result = prime * result + ((mExitMessage == null) ? 0 :
mExitMessage.hashCode());
+ result = prime * result + mExitStatus.hashCode();
result = prime * result + (mWin2kHackEnable ? 1231 : 1237);
- result = prime
- * result
- + ((migrating_to_vds == null) ? 0 : migrating_to_vds
- .hashCode());
- result = prime * result
- + ((pauseStatus == null) ? 0 : pauseStatus.hashCode());
- result = prime * result
- + ((run_on_vds == null) ? 0 : run_on_vds.hashCode());
- result = prime * result
- + session.hashCode() * prime;
- result = prime * result
- + status.hashCode() * prime;
- result = prime * result
- + ((utc_diff == null) ? 0 : utc_diff.hashCode());
- result = prime * result
- + ((id == null) ? 0 : id.hashCode());
- result = prime * result
- + ((vm_host == null) ? 0 : vm_host.hashCode());
- result = prime * result
- + ((vm_ip == null) ? 0 : vm_ip.hashCode());
- result = prime
- * result
- + ((lastStartTime == null) ? 0
- : lastStartTime.hashCode());
- result = prime * result
- + ((vm_pid == null) ? 0 : vm_pid.hashCode());
+ result = prime * result + ((migrating_to_vds == null) ? 0 :
migrating_to_vds.hashCode());
+ result = prime * result + ((pauseStatus == null) ? 0 :
pauseStatus.hashCode());
+ result = prime * result + ((run_on_vds == null) ? 0 :
run_on_vds.hashCode());
+ result = prime * result + session.hashCode();
+ result = prime * result + status.hashCode();
+ result = prime * result + ((utc_diff == null) ? 0 :
utc_diff.hashCode());
+ result = prime * result + ((vm_host == null) ? 0 : vm_host.hashCode());
+ result = prime * result + ((vm_ip == null) ? 0 : vm_ip.hashCode());
+ result = prime * result + ((lastStartTime == null) ? 0 :
lastStartTime.hashCode());
+ result = prime * result + ((vm_pid == null) ? 0 : vm_pid.hashCode());
return result;
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmPool.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmPool.java
index c516f1f..c2db042 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmPool.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmPool.java
@@ -59,6 +59,7 @@
public int hashCode() {
final int prime = 31;
int result = 1;
+ result = prime * result + ((id == null) ? 0 : id.hashCode());
result = prime * result + ((defaultEndTime == null) ? 0 :
defaultEndTime.hashCode());
result = prime * result + ((defaultStartTime == null) ? 0 :
defaultStartTime.hashCode());
result = prime * result + defaultTimeInDays;
@@ -67,7 +68,6 @@
result = prime * result + ((vdsGroupName == null) ? 0 :
vdsGroupName.hashCode());
result = prime * result + vmPoolAssignedCount;
result = prime * result + ((description == null) ? 0 :
description.hashCode());
- result = prime * result + ((id == null) ? 0 : id.hashCode());
result = prime * result + ((name == null) ? 0 : name.hashCode());
result = prime * result + vmPoolRunningCount;
result = prime * result + ((type == null) ? 0 : type.hashCode());
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatic.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatic.java
index bea8e20..804815f 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatic.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatic.java
@@ -193,7 +193,7 @@
result = prime * result + ((predefinedProperties == null) ? 0 :
predefinedProperties.hashCode());
result = prime * result + ((userDefinedProperties == null) ? 0 :
userDefinedProperties.hashCode());
result = prime * result + ((vmtGuid == null) ? 0 : vmtGuid.hashCode());
- result = prime * result + (useHostCpuFlags ? 0 : 1);
+ result = prime * result + (useHostCpuFlags ? 1231 : 1237);
return result;
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatistics.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatistics.java
index 2b935e8..cb28ddc 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatistics.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmStatistics.java
@@ -15,40 +15,16 @@
public int hashCode() {
final int prime = 31;
int result = 1;
- result = prime * result
- + ((cpu_sysField == null) ? 0 : cpu_sysField.hashCode());
- result = prime * result
- + ((cpu_userField == null) ? 0 : cpu_userField.hashCode());
- result = prime
- * result
- + ((elapsed_timeField == null) ? 0 : elapsed_timeField
- .hashCode());
- result = prime
- * result
- + ((interfaceStatisticsField == null) ? 0
- : interfaceStatisticsField.hashCode());
- result = prime
- * result
- + ((roundedElapsedTimeField == null) ? 0
- : roundedElapsedTimeField.hashCode());
- result = prime
- * result
- + ((usage_cpu_percentField == null) ? 0
- : usage_cpu_percentField.hashCode());
- result = prime
- * result
- + ((usage_mem_percentField == null) ? 0
- : usage_mem_percentField.hashCode());
- result = prime
- * result
- + ((usage_network_percentField == null) ? 0
- : usage_network_percentField.hashCode());
- result = prime
- * result
- + ((disksUsage == null) ? 0
- : disksUsage.hashCode());
- result = prime * result
- + ((vm_guidField == null) ? 0 : vm_guidField.hashCode());
+ result = prime * result + ((cpu_sysField == null) ? 0 :
cpu_sysField.hashCode());
+ result = prime * result + ((cpu_userField == null) ? 0 :
cpu_userField.hashCode());
+ result = prime * result + ((elapsed_timeField == null) ? 0 :
elapsed_timeField.hashCode());
+ result = prime * result + ((interfaceStatisticsField == null) ? 0 :
interfaceStatisticsField.hashCode());
+ result = prime * result + ((roundedElapsedTimeField == null) ? 0 :
roundedElapsedTimeField.hashCode());
+ result = prime * result + ((usage_cpu_percentField == null) ? 0 :
usage_cpu_percentField.hashCode());
+ result = prime * result + ((usage_mem_percentField == null) ? 0 :
usage_mem_percentField.hashCode());
+ result = prime * result + ((usage_network_percentField == null) ? 0 :
usage_network_percentField.hashCode());
+ result = prime * result + ((disksUsage == null) ? 0 :
disksUsage.hashCode());
+ result = prime * result + ((vm_guidField == null) ? 0 :
vm_guidField.hashCode());
return result;
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage_pool.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage_pool.java
index 9db4f3f..edd6b37 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage_pool.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage_pool.java
@@ -169,10 +169,10 @@
public int hashCode() {
final int prime = 31;
int result = 1;
- result = prime * result + ((LVER == null) ? 0 : LVER.hashCode());
- result = prime * result + ((compatibilityVersion == null) ? 0 :
compatibilityVersion.hashCode());
- result = prime * result + ((description == null) ? 0 :
description.hashCode());
result = prime * result + ((id == null) ? 0 : id.hashCode());
+ result = prime * result + ((LVER == null) ? 0 : LVER.hashCode());
+ result = prime * result + ((description == null) ? 0 :
description.hashCode());
+ result = prime * result + ((compatibilityVersion == null) ? 0 :
compatibilityVersion.hashCode());
result = prime * result + masterDomainVersion;
result = prime * result + ((name == null) ? 0 : name.hashCode());
result = prime * result + ((recovery_mode == null) ? 0 :
recovery_mode.hashCode());
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/tags.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/tags.java
index 6620f64..e7fc002 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/tags.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/tags.java
@@ -48,21 +48,13 @@
public int hashCode() {
final int prime = 31;
int result = 1;
- result = prime * result
- + ((_children == null) ? 0 : _children.hashCode());
- result = prime
- * result
- + ((description == null) ? 0 : description.hashCode());
- result = prime * result
- + ((parent == null) ? 0 : parent.hashCode());
- result = prime * result
- + ((readonly == null) ? 0 : readonly.hashCode());
- result = prime * result
- + ((id == null) ? 0 : id.hashCode());
- result = prime * result
- + ((name == null) ? 0 : name.hashCode());
- result = prime * result
- + ((type == null) ? 0 : type.hashCode());
+ result = prime * result + ((id == null) ? 0 : id.hashCode());
+ result = prime * result + ((_children == null) ? 0 :
_children.hashCode());
+ result = prime * result + ((description == null) ? 0 :
description.hashCode());
+ result = prime * result + ((parent == null) ? 0 : parent.hashCode());
+ result = prime * result + ((readonly == null) ? 0 :
readonly.hashCode());
+ result = prime * result + ((name == null) ? 0 : name.hashCode());
+ result = prime * result + ((type == null) ? 0 : type.hashCode());
return result;
}
--
To view, visit http://gerrit.ovirt.org/12538
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: If925715cc91c1b4a53a7f6d212ac51043412db53
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Greg Padgett <gpadg...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
