Greg Padgett has uploaded a new change for review.
Change subject: core: clean up businessentity hashCode() methods [part 1]
......................................................................
core: clean up businessentity hashCode() methods [part 1]
Organize hashCode() methods into a consistent format and consistent
ordering with equals(). This will make field-by-field comparison and
maintenance easier.
Change-Id: Ia9a7f60883e6f118690cee4a53d7705f288a2f24
Signed-off-by: Greg Padgett <gpadg...@redhat.com>
---
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/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/Image.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LUN_storage_server_connection_map.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LUNs.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LdapGroup.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Quota.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Role.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/permissions.java
19 files changed, 62 insertions(+), 109 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/37/12537/1
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ActionVersionMap.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ActionVersionMap.java
index bfc67d9..12452da 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ActionVersionMap.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/ActionVersionMap.java
@@ -70,15 +70,9 @@
public int hashCode() {
final int prime = 31;
int result = 1;
- result = prime * result + actionType * prime;
- result =
- prime * result
- + ((clusterMinimalVersion == null) ? 0 :
clusterMinimalVersion.hashCode());
- result =
- prime
- * result
- + ((storagePoolMinimalVersion == null) ? 0
- : storagePoolMinimalVersion.hashCode());
+ result = prime * result + actionType;
+ result = prime * result + ((clusterMinimalVersion == null) ? 0 :
clusterMinimalVersion.hashCode());
+ result = prime * result + ((storagePoolMinimalVersion == null) ? 0 :
storagePoolMinimalVersion.hashCode());
return result;
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AsyncTasks.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AsyncTasks.java
index 7f8d854..9a50aca 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AsyncTasks.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AsyncTasks.java
@@ -149,17 +149,16 @@
public int hashCode() {
final int prime = 31;
int results = 1;
+ results = prime * results + ((taskId == null) ? 0 : taskId.hashCode());
+ results = prime * results + ((stepId == null) ? 0 : stepId.hashCode());
+ results = prime * results + ((commandId == null) ? 0 :
commandId.hashCode());
results = prime * results + ((actionParameters == null) ? 0 :
actionParameters.hashCode());
results = prime * results + ((actionType == null) ? 0 :
actionType.hashCode());
results = prime * results + ((result == null) ? 0 : result.hashCode());
results = prime * results + ((status == null) ? 0 : status.hashCode());
- results = prime * results + ((taskId == null) ? 0 : taskId.hashCode());
- results = prime * results + ((stepId == null) ? 0 : stepId.hashCode());
- results = prime * results + ((commandId == null) ? 0 :
commandId.hashCode());
- results = prime * results + ((startTime == null) ? 0 :
startTime.hashCode());
+ results = prime * results + ((startTime == null) ? 0 :
startTime.hashCode());
results = prime * results + ((storagePoolId == null) ? 0 :
storagePoolId.hashCode());
results = prime * results + ((taskType == null) ? 0 :
taskType.hashCode());
-
return results;
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AuditLog.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AuditLog.java
index 2f4192f..a631423 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AuditLog.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/AuditLog.java
@@ -410,25 +410,25 @@
int result = 1;
result = prime * result + (int) (auditLogId ^ (auditLogId >>> 32));
result = prime * result + ((logTime == null) ? 0 : logTime.hashCode());
- result = prime * result + (logType * prime);
+ result = prime * result + logType;
result = prime * result + ((message == null) ? 0 : message.hashCode());
result = prime * result + ((storageDomainId == null) ? 0 :
storageDomainId.hashCode());
result = prime * result + ((storagePoolId == null) ? 0 :
storagePoolId.hashCode());
- result = prime * result + (severity * prime);
+ result = prime * result + severity;
result = prime * result + ((userId == null) ? 0 : userId.hashCode());
result = prime * result + ((vdsId == null) ? 0 : vdsId.hashCode());
result = prime * result + ((quotaId == null) ? 0 : quotaId.hashCode());
result = prime * result + ((vmId == null) ? 0 : vmId.hashCode());
result = prime * result + ((vmTemplateId == null) ? 0 :
vmTemplateId.hashCode());
- result = prime * result + (processed ? prime : 0);
+ result = prime * result + (processed ? 1231 : 1237);
result = prime * result + ((correlationId == null) ? 0 :
correlationId.hashCode());
result = prime * result + ((jobId == null) ? 0 : jobId.hashCode());
result = prime * result + ((origin == null) ? 0 : origin.hashCode());
- result = prime * result + (customEventId * prime);
- result = prime * result + (eventFloodInSec * prime);
+ result = prime * result + customEventId;
+ result = prime * result + eventFloodInSec;
result = prime * result + ((customData == null) ? 0 :
customData.hashCode());
- result = prime * result + ((external) ? 1 : 0);
- result = prime * result + ((deleted) ? 1 : 0);
+ result = prime * result + (external ? 1231 : 1237);
+ result = prime * result + (deleted ? 1231 : 1237);
return result;
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/BaseDisk.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/BaseDisk.java
index 3d79ca9..be9e773 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/BaseDisk.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/BaseDisk.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 + ((diskAlias == null) ? 0 :
diskAlias.hashCode());
result = prime * result + ((diskDescription == null) ? 0 :
diskDescription.hashCode());
result = prime * result + ((diskInterface == null) ? 0 :
diskInterface.hashCode());
- result = prime * result + ((id == null) ? 0 : id.hashCode());
result = prime * result + ((propagateErrors == null) ? 0 :
propagateErrors.hashCode());
result = prime * result + (shareable ? 1231 : 1237);
result = prime * result + (isWipeAfterDelete() ? 1231 : 1237);
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Bookmark.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Bookmark.java
index c3ebdcd..0dcd70c 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Bookmark.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Bookmark.java
@@ -54,11 +54,12 @@
@Override
public int hashCode() {
- int hash = this.name.hashCode() * 7;
- hash += this.value.hashCode() * 7;
- hash += this.id.hashCode() * 7;
-
- return hash;
+ final int prime = 31;
+ int result = 1;
+ result = prime * result + ((id == null) ? 0 : id.hashCode());
+ result = prime * result + ((name == null) ? 0 : name.hashCode());
+ result = prime * result + ((value == null) ? 0 : value.hashCode());
+ return result;
}
@Override
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbUser.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbUser.java
index 025f773..5c56891 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbUser.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DbUser.java
@@ -84,36 +84,20 @@
public int hashCode() {
final int prime = 31;
int result = 1;
- result = prime * result
- + ((department == null) ? 0 : department.hashCode());
- result = prime
- * result
- + ((desktopDevice == null) ? 0 : desktopDevice
- .hashCode());
- result = prime * result
- + ((domain == null) ? 0 : domain.hashCode());
- result = prime * result
- + ((email == null) ? 0 : email.hashCode());
- result = prime * result
- + ((groups == null) ? 0 : groups.hashCode());
+ result = prime * result + ((id == null) ? 0 : id.hashCode());
+ result = prime * result + ((department == null) ? 0 :
department.hashCode());
+ result = prime * result + ((desktopDevice == null) ? 0 :
desktopDevice.hashCode());
+ result = prime * result + ((domain == null) ? 0 : domain.hashCode());
+ result = prime * result + ((email == null) ? 0 : email.hashCode());
+ result = prime * result + ((groups == null) ? 0 : groups.hashCode());
result = prime * result + (lastAdminCheckStatus ? 1231 : 1237);
- result = prime * result
- + ((name == null) ? 0 : name.hashCode());
- result = prime * result
- + ((note == null) ? 0 : note.hashCode());
- result = prime * result
- + ((role == null) ? 0 : role.hashCode());
+ result = prime * result + ((name == null) ? 0 : name.hashCode());
+ result = prime * result + ((note == null) ? 0 : note.hashCode());
+ result = prime * result + ((role == null) ? 0 : role.hashCode());
result = prime * result + status;
- result = prime * result
- + ((surname == null) ? 0 : surname.hashCode());
- result = prime
- * result
- + ((userIconPath == null) ? 0 : userIconPath
- .hashCode());
- result = prime * result
- + ((id == null) ? 0 : id.hashCode());
- result = prime * result
- + ((username == null) ? 0 : username.hashCode());
+ result = prime * result + ((surname == null) ? 0 : surname.hashCode());
+ result = prime * result + ((userIconPath == null) ? 0 :
userIconPath.hashCode());
+ result = prime * result + ((username == null) ? 0 :
username.hashCode());
return result;
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Disk.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Disk.java
index 6918352..85cdecd 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Disk.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Disk.java
@@ -85,10 +85,10 @@
public int hashCode() {
final int prime = 31;
int result = super.hashCode();
- result = prime * result + numberOfVms;
result = prime * result + ((plugged == null) ? 0 : plugged.hashCode());
- result = prime * result + ((vmEntityType == null) ? 0 :
vmEntityType.hashCode());
result = prime * result + ((vmNames == null) ? 0 : vmNames.hashCode());
+ result = prime * result + ((vmEntityType == null) ? 0 :
vmEntityType.hashCode());
+ result = prime * result + numberOfVms;
return result;
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImage.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImage.java
index 3ea57de..85209e1 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImage.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImage.java
@@ -423,12 +423,9 @@
result = prime * result + ((storagePoolId == null) ? 0 :
storagePoolId.hashCode());
result = prime * result + ((storagesNames == null) ? 0 :
storagesNames.hashCode());
result = prime * result + writeRateFromDiskImageDynamic;
- result = prime * result
- + ((flushLatency == null) ? 0 : flushLatency.hashCode());
- result = prime * result
- + ((readLatency == null) ? 0 : readLatency.hashCode());
- result = prime * result
- + ((writeLatency == null) ? 0 : writeLatency.hashCode());
+ result = prime * result + ((readLatency == null) ? 0 :
readLatency.hashCode());
+ result = prime * result + ((writeLatency == null) ? 0 :
writeLatency.hashCode());
+ result = prime * result + ((flushLatency == null) ? 0 :
flushLatency.hashCode());
return result;
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImageDynamic.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImageDynamic.java
index b0601b8..c40d41c 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImageDynamic.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/DiskImageDynamic.java
@@ -75,12 +75,12 @@
public int hashCode() {
final int prime = 31;
int result = 1;
- result = prime * result + (int) (actualSize ^ (actualSize >>> 32));
result = prime * result + ((id == null) ? 0 : id.hashCode());
+ result = prime * result + (int) (actualSize ^ (actualSize >>> 32));
result = prime * result + ((readRate == null) ? 0 :
readRate.hashCode());
result = prime * result + ((writeRate == null) ? 0 :
writeRate.hashCode());
- result = prime * result + ((writeLatency == null) ? 0 :
writeLatency.hashCode());
result = prime * result + ((readLatency == null) ? 0 :
readLatency.hashCode());
+ result = prime * result + ((writeLatency == null) ? 0 :
writeLatency.hashCode());
result = prime * result + ((flushLatency == null) ? 0 :
flushLatency.hashCode());
return result;
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Image.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Image.java
index 7bc795f..aee1d04 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Image.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Image.java
@@ -186,8 +186,8 @@
public int hashCode() {
final int prime = 31;
int result = 1;
- result = prime * result + (active ? 1231 : 1237);
result = prime * result + ((id == null) ? 0 : id.hashCode());
+ result = prime * result + (active ? 1231 : 1237);
result = prime * result + ((lastModified == null) ? 0 :
lastModified.hashCode());
result = prime * result + ((parentId == null) ? 0 :
parentId.hashCode());
result = prime * result + ((snapshotId == null) ? 0 :
snapshotId.hashCode());
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LUN_storage_server_connection_map.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LUN_storage_server_connection_map.java
index c01fde7..379beee 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LUN_storage_server_connection_map.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LUN_storage_server_connection_map.java
@@ -48,9 +48,8 @@
final int prime = 31;
int result = 1;
result = prime * result + ((id.lunId == null) ? 0 :
id.lunId.hashCode());
- result =
- prime * result
- + ((id.storageServerConnection == null) ? 0 :
id.storageServerConnection.hashCode());
+ result = prime * result
+ + ((id.storageServerConnection == null) ? 0 :
id.storageServerConnection.hashCode());
return result;
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LUNs.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LUNs.java
index 18524c8..2e7593b 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LUNs.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LUNs.java
@@ -23,8 +23,8 @@
public int hashCode() {
final int prime = 31;
int result = 1;
- result = prime * result + ((_lunConnections == null) ? 0 :
_lunConnections.hashCode());
result = prime * result + ((id == null) ? 0 : id.hashCode());
+ result = prime * result + ((_lunConnections == null) ? 0 :
_lunConnections.hashCode());
result = prime * result + ((lunMapping == null) ? 0 :
lunMapping.hashCode());
result = prime * result + ((physicalVolumeId == null) ? 0 :
physicalVolumeId.hashCode());
result = prime * result + deviceSize;
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LdapGroup.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LdapGroup.java
index 998561a..2fd0ec4 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LdapGroup.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/LdapGroup.java
@@ -120,8 +120,8 @@
public int hashCode() {
final int prime = 31;
int result = 1;
- result = prime * result + ((distinguishedName == null) ? 0 :
distinguishedName.hashCode());
result = prime * result + ((id == null) ? 0 : id.hashCode());
+ result = prime * result + ((distinguishedName == null) ? 0 :
distinguishedName.hashCode());
result = prime * result + ((domain == null) ? 0 : domain.hashCode());
result = prime * result + ((memberOf == null) ? 0 :
memberOf.hashCode());
result = prime * result + ((name == null) ? 0 : name.hashCode());
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Quota.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Quota.java
index 2adba28..1cf5352 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Quota.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Quota.java
@@ -339,12 +339,12 @@
public int hashCode() {
final int prime = 31;
int result = 1;
+ result = prime * result + ((id == null) ? 0 : id.hashCode());
result = prime * result + ((description == null) ? 0 :
description.hashCode());
result = prime * result + ((globalQuotaStorage == null) ? 0 :
globalQuotaStorage.hashCode());
result = prime * result + ((globalQuotaVdsGroup == null) ? 0 :
globalQuotaVdsGroup.hashCode());
result = prime * result + graceStoragePercentage;
result = prime * result + graceVdsGroupPercentage;
- result = prime * result + ((id == null) ? 0 : id.hashCode());
result = prime * result + ((quotaName == null) ? 0 :
quotaName.hashCode());
result = prime * result + ((quotaStorageList == null) ? 0 :
quotaStorageList.hashCode());
result = prime * result + ((quotaVdsGroupList == null) ? 0 :
quotaVdsGroupList.hashCode());
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Role.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Role.java
index 732cee5..e4b9c5f 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Role.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/Role.java
@@ -45,8 +45,8 @@
public int hashCode() {
final int prime = 31;
int result = 1;
- result = prime * result + ((description == null) ? 0 :
description.hashCode());
result = prime * result + ((id == null) ? 0 : id.hashCode());
+ result = prime * result + ((description == null) ? 0 :
description.hashCode());
result = prime * result + (readOnly ? 1231 : 1237);
result = prime * result + ((name == null) ? 0 : name.hashCode());
result = prime * result + ((type == null) ? 0 : type.hashCode());
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/event_notification_hist.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/event_notification_hist.java
index 31233a8..d8b8f06 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/event_notification_hist.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/event_notification_hist.java
@@ -97,12 +97,12 @@
final int prime = 31;
int result = 1;
result = prime * result + (int) (auditLogId ^ (auditLogId >>> 32));
+ result = prime * result + ((subscriberId == null) ? 0 :
subscriberId.hashCode());
result = prime * result + ((eventName == null) ? 0 :
eventName.hashCode());
result = prime * result + ((methodType == null) ? 0 :
methodType.hashCode());
result = prime * result + ((reason == null) ? 0 : reason.hashCode());
result = prime * result + ((sentAt == null) ? 0 : sentAt.hashCode());
result = prime * result + (status ? 1231 : 1237);
- result = prime * result + ((subscriberId == null) ? 0 :
subscriberId.hashCode());
return result;
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/event_subscriber.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/event_subscriber.java
index cf9bd1f..b66360b 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/event_subscriber.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/event_subscriber.java
@@ -19,21 +19,11 @@
public int hashCode() {
final int prime = 31;
int result = 1;
- result = prime
- * result
- + ((id.eventUpName == null) ? 0 : id.eventUpName
- .hashCode());
- result = prime
- * result
- + ((methodAddress == null) ? 0 : methodAddress
- .hashCode());
+ result = prime * result + ((id.eventUpName == null) ? 0 :
id.eventUpName.hashCode());
+ result = prime * result + ((methodAddress == null) ? 0 :
methodAddress.hashCode());
result = prime * result + id.methodId;
- result = prime
- * result
- + ((id.subscriberId == null) ? 0 : id.subscriberId
- .hashCode());
- result = prime * result
- + ((id.tagName == null) ? 0 : id.tagName.hashCode());
+ result = prime * result + ((id.subscriberId == null) ? 0 :
id.subscriberId.hashCode());
+ result = prime * result + ((id.tagName == null) ? 0 :
id.tagName.hashCode());
return result;
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/event_subscriber_id.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/event_subscriber_id.java
index 73049ac..f0a6924 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/event_subscriber_id.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/event_subscriber_id.java
@@ -28,9 +28,9 @@
public int hashCode() {
final int prime = 31;
int result = 1;
+ result = prime * result + ((subscriberId == null) ? 0 :
subscriberId.hashCode());
result = prime * result + ((eventUpName == null) ? 0 :
eventUpName.hashCode());
result = prime * result + methodId;
- result = prime * result + ((subscriberId == null) ? 0 :
subscriberId.hashCode());
result = prime * result + ((tagName == null) ? 0 : tagName.hashCode());
return result;
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/permissions.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/permissions.java
index d2903e4..027abea 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/permissions.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/permissions.java
@@ -134,27 +134,16 @@
public int hashCode() {
final int prime = 31;
int result = 1;
- result = prime
- * result
- + ((adElementId == null) ? 0 : adElementId
- .hashCode());
result = prime * result + ((id == null) ? 0 : id.hashCode());
- result = prime * result
- + ((objectId == null) ? 0 : objectId.hashCode());
- result = prime * result
- + ((objectName == null) ? 0 : objectName.hashCode());
- result = prime * result
- + ((objectType == null) ? 0 : objectType.hashCode());
- result = prime * result
- + ((ownerName == null) ? 0 : ownerName.hashCode());
- result = prime * result
- + ((tags == null) ? 0 : tags.hashCode());
- result = prime * result
- + ((roleName == null) ? 0 : roleName.hashCode());
- result = prime * result
- + ((roleType == null) ? 0 : roleType.hashCode());
- result = prime * result
- + ((roleId == null) ? 0 : roleId.hashCode());
+ result = prime * result + ((adElementId == null) ? 0 :
adElementId.hashCode());
+ result = prime * result + ((objectId == null) ? 0 :
objectId.hashCode());
+ result = prime * result + ((objectName == null) ? 0 :
objectName.hashCode());
+ result = prime * result + ((objectType == null) ? 0 :
objectType.hashCode());
+ result = prime * result + ((ownerName == null) ? 0 :
ownerName.hashCode());
+ result = prime * result + ((tags == null) ? 0 : tags.hashCode());
+ result = prime * result + ((roleName == null) ? 0 :
roleName.hashCode());
+ result = prime * result + ((roleType == null) ? 0 :
roleType.hashCode());
+ result = prime * result + ((roleId == null) ? 0 : roleId.hashCode());
return result;
}
--
To view, visit http://gerrit.ovirt.org/12537
To unsubscribe, visit http://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia9a7f60883e6f118690cee4a53d7705f288a2f24
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
