Tal Nisan has uploaded a new change for review. Change subject: core: Implement toString() in StorageDomain,StorageDomainStatic,StoragePool ......................................................................
core: Implement toString() in StorageDomain,StorageDomainStatic,StoragePool Change-Id: I34a70ea21e6c5996d430eef013c5d93360aa04e4 Bug-Url: https://bugzilla.redhat.com/1142198 Signed-off-by: Tal Nisan <[email protected]> --- 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/StorageDomainStatic.java M backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StoragePool.java 3 files changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/11/33011/1 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 4d0af90..ce9f090 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 @@ -348,4 +348,13 @@ && storageDomainOverCommitPercent == other.storageDomainOverCommitPercent && ObjectUtils.objectsEqual(totalDiskSize, other.totalDiskSize)); } + + @Override + public String toString() { + // Since the static data arrives from external source it's not guarenteed not to be null so a null check is + // mandatory in order to avoid NPE when invoking toString by the logger + String domainName = staticData == null ? "null" : staticData.getName(); + Guid domainId = staticData == null ? null : staticData.getId(); + return "StorageDomain[" + domainName + ", " + domainId + "]"; + } } 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 6c019b9..28f2db6 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 @@ -218,4 +218,9 @@ && sanState == other.sanState && ObjectUtils.objectsEqual(description, other.description)); } + + @Override + public String toString() { + return "StorageDomainStatic[" + getName() + ", " + getId() + "]"; + } } diff --git a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StoragePool.java b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StoragePool.java index 269dd52..6a64c85 100644 --- a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StoragePool.java +++ b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StoragePool.java @@ -234,4 +234,16 @@ this.quotaEnforcementType = quotaEnforcementType; } + public Guid getMacPoolId() { + return macPoolId; + } + + public void setMacPoolId(Guid macPoolId) { + this.macPoolId = macPoolId; + } + + @Override + public String toString() { + return "StoragePool[" + getName() + ", " + getId() + "]"; + } } -- To view, visit http://gerrit.ovirt.org/33011 To unsubscribe, visit http://gerrit.ovirt.org/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I34a70ea21e6c5996d430eef013c5d93360aa04e4 Gerrit-PatchSet: 1 Gerrit-Project: ovirt-engine Gerrit-Branch: ovirt-engine-3.5 Gerrit-Owner: Tal Nisan <[email protected]> _______________________________________________ Engine-patches mailing list [email protected] http://lists.ovirt.org/mailman/listinfo/engine-patches
