Martin Peřina has uploaded a new change for review.
Change subject: core: Use ToStringBuilder in storage classes
......................................................................
core: Use ToStringBuilder in storage classes
Refactor existing toString() methods to use ToStringBuilder in storage
classes.
Change-Id: Ia7787007a0cb30aa391ef3bddbecc997e81a76d3
Signed-off-by: Martin Perina <mper...@redhat.com>
---
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/DestroyImageParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/MergeParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/HttpLocationInfo.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/OpenStackImageProviderProperties.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/StorageDomainOvfInfo.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
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StoragePoolIsoMapId.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/gluster/StorageDevice.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage/CinderVolumeType.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage/LUNs.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage/OpenStackVolumeProviderProperties.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/AllStorageAndImageIdVDSCommandParametersBase.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ChangeDiskVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ConnectStoragePoolVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CopyImageVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateImageVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateSnapshotVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateStorageDomainVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateStoragePoolVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateVGVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DeactivateStorageDomainVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DeleteImageGroupVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DestroyImageVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DetachStorageDomainVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DisconnectStoragePoolVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ExtendStorageDomainVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetDeviceListVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetImagesListVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetStorageConnectionsListVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetVGInfoVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HSMGetIsoListParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HSMGetStorageDomainsListVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HSMTaskGuidBaseVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HotPlugDiskVDSParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/IrsBaseVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MergeSnapshotsVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MergeVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MoveImageGroupVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ReconstructMasterVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ResetIrsVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SPMTaskGuidBaseVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetStorageDomainDescriptionVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SpmStartVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/StorageDomainIdParametersBase.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/StoragePoolDomainAndGroupIdBaseVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/StorageServerConnectionManagementVDSParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SyncImageGroupDataVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/TargetDomainImageGroupVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/UpgradeStoragePoolVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VdsAndPoolIDVDSParametersBase.java
53 files changed, 319 insertions(+), 303 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/83/39983/1
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/DestroyImageParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/DestroyImageParameters.java
index c3393a5..b07ef82 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/DestroyImageParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/DestroyImageParameters.java
@@ -2,6 +2,7 @@
import java.util.List;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class DestroyImageParameters extends StorageDomainParametersBase {
@@ -53,14 +54,12 @@
}
@Override
- public String toString() {
- return new StringBuilder("DestroyImageParameters{")
- .append(super.toString())
- .append(", vmId=").append(vmId)
- .append(", imageGroupId=").append(imageGroupId)
- .append(", imageList=").append(imageList)
- .append(", postZero=").append(postZero)
- .append(", force=").append(force)
- .append('}').toString();
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("vmId", vmId)
+ .append("imageGroupId", imageGroupId)
+ .append("imageList", imageList)
+ .append("postZero", postZero)
+ .append("force", force);
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/MergeParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/MergeParameters.java
index 640f4c7..797825e 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/MergeParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/action/MergeParameters.java
@@ -3,6 +3,7 @@
import java.util.Set;
import org.ovirt.engine.core.common.businessentities.storage.DiskImage;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class MergeParameters extends StorageDomainParametersBase {
@@ -80,14 +81,12 @@
}
@Override
- public String toString() {
- return new StringBuilder("MergeParameters{")
- .append(super.toString())
- .append(", vmId=").append(vmId)
- .append(", activeImage=").append(activeImage)
- .append(", baseImage=").append(baseImage)
- .append(", topImage=").append(topImage)
- .append(", bandwidth=").append(bandwidth)
- .append('}').toString();
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("vmId", vmId)
+ .append("activeImage", activeImage)
+ .append("baseImage", baseImage)
+ .append("topImage", topImage)
+ .append("bandwidth", bandwidth);
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/HttpLocationInfo.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/HttpLocationInfo.java
index 3146778..d6eee90 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/HttpLocationInfo.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/HttpLocationInfo.java
@@ -2,6 +2,8 @@
import java.util.Map;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
+
public class HttpLocationInfo extends LocationInfo {
String url;
Map<String, String> headers;
@@ -30,6 +32,9 @@
@Override
public String toString() {
- return "HttpLocationInfo [url=" + url + ", headers=" + headers + "]";
+ return ToStringBuilder.forInstance(this)
+ .append("url", url)
+ .append("headers", headers)
+ .build();
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/OpenStackImageProviderProperties.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/OpenStackImageProviderProperties.java
index b328123..f3593fa 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/OpenStackImageProviderProperties.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/OpenStackImageProviderProperties.java
@@ -3,15 +3,4 @@
public class OpenStackImageProviderProperties extends TenantProviderProperties
{
private static final long serialVersionUID = -3887979451360188295L;
-
- @Override
- public String toString() {
- StringBuilder builder = new StringBuilder();
- builder.append("OpenStackImageProviderProperties [pluginType=")
- .append(", tenantName=")
- .append(getTenantName())
- .append("]");
- return builder.toString();
- }
-
}
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 77f0105..aa9a819 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
@@ -7,6 +7,7 @@
import org.ovirt.engine.core.common.errors.VdcBllErrors;
import org.ovirt.engine.core.common.utils.ObjectUtils;
import org.ovirt.engine.core.common.utils.SizeConverter;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class StorageDomain extends IVdcQueryable implements
BusinessEntityWithStatus<Guid, StorageDomainStatus>, Nameable, Commented {
@@ -359,8 +360,9 @@
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 + "]";
+ return ToStringBuilder.forInstance(this)
+ .append("domainName", staticData == null ? null :
staticData.getName())
+ .append("domainId", staticData == null ? null :
staticData.getId())
+ .build();
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainOvfInfo.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainOvfInfo.java
index 5388a73..e5ae8dc 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainOvfInfo.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StorageDomainOvfInfo.java
@@ -4,6 +4,7 @@
import java.util.List;
import org.ovirt.engine.core.common.utils.ObjectUtils;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class StorageDomainOvfInfo implements BusinessEntity<Guid> {
@@ -101,12 +102,12 @@
@Override
public String toString() {
- return "StorageDomainOvfInfo{" +
- "storageDomainId=" + storageDomainId +
- ", storedOvfIds=" + storedOvfIds +
- ", ovfDiskId=" + ovfDiskId +
- ", status=" + status +
- ", lastUpdated=" + lastUpdated +
- '}';
+ return ToStringBuilder.forInstance(this)
+ .append("storageDomainId", storageDomainId)
+ .append("storedOvfIds", storedOvfIds)
+ .append("ovfDiskId", ovfDiskId)
+ .append("status", status)
+ .append("lastUpdated", lastUpdated)
+ .build();
}
}
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 69a535a..d14fe61 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
@@ -4,6 +4,7 @@
import org.ovirt.engine.core.common.businessentities.storage.StorageType;
import org.ovirt.engine.core.common.utils.ObjectUtils;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.common.validation.annotation.ValidDescription;
import org.ovirt.engine.core.common.validation.annotation.ValidName;
import org.ovirt.engine.core.common.validation.group.CreateEntity;
@@ -224,6 +225,9 @@
@Override
public String toString() {
- return "StorageDomainStatic[" + getName() + ", " + getId() + "]";
+ return ToStringBuilder.forInstance(this)
+ .append("name", getName())
+ .append("id", getId())
+ .build();
}
}
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 b592c04..3c479e2 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
@@ -4,6 +4,7 @@
import javax.validation.constraints.Size;
import org.ovirt.engine.core.common.utils.ObjectUtils;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.common.utils.ValidationUtils;
import org.ovirt.engine.core.common.validation.annotation.ValidName;
import org.ovirt.engine.core.common.validation.group.CreateEntity;
@@ -243,6 +244,9 @@
@Override
public String toString() {
- return "StoragePool[" + getName() + ", " + getId() + "]";
+ return ToStringBuilder.forInstance(this)
+ .append("name", getName())
+ .append("id", getId())
+ .build();
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StoragePoolIsoMapId.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StoragePoolIsoMapId.java
index 1670849..38fd1f6 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StoragePoolIsoMapId.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/StoragePoolIsoMapId.java
@@ -3,6 +3,7 @@
import java.io.Serializable;
import org.ovirt.engine.core.common.utils.ObjectUtils;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class StoragePoolIsoMapId implements Serializable {
@@ -47,10 +48,10 @@
@Override
public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append("storagePoolId = ").append(getStoragePoolId());
- sb.append(", storageId = ").append(getStorageId());
- return sb.toString();
+ return ToStringBuilder.forInstance(this)
+ .append("storagePoolId", getStoragePoolId())
+ .append("storageId", getStorageId())
+ .build();
}
public Guid getStorageId() {
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 1e3584a..fcd48a1 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
@@ -5,6 +5,7 @@
import javax.validation.constraints.Min;
import org.ovirt.engine.core.common.businessentities.storage.StorageType;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
public class StorageServerConnections implements Serializable {
private static final long serialVersionUID = 5444293590307760809L;
@@ -239,33 +240,18 @@
@Override
public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append("{ id: ");
- sb.append(this.getid());
- sb.append(", connection: ");
- sb.append(this.getconnection());
- sb.append(", iqn: ");
- sb.append(this.getiqn());
- sb.append(", vfsType: ");
- sb.append(this.getVfsType());
- sb.append(", mountOptions: ");
- sb.append(this.getMountOptions());
- sb.append(", nfsVersion: ");
- sb.append(this.getNfsVersion());
- sb.append(", nfsRetrans: ");
- sb.append(this.getNfsRetrans());
- sb.append(", nfsTimeo: ");
- sb.append(this.getNfsTimeo());
- if (this.getIface() != null) {
- sb.append(", iface: ");
- sb.append(this.getIface());
- }
- if (getNetIfaceName() != null) {
- sb.append(", netIfaceName: ");
- sb.append(this.getNetIfaceName());
- }
- sb.append(" };");
- return sb.toString();
+ return ToStringBuilder.forInstance(this)
+ .append("id", getid())
+ .append("connection", getconnection())
+ .append("iqn", getiqn())
+ .append("vfsType", getVfsType())
+ .append("mountOptions", getMountOptions())
+ .append("nfsVersion", getNfsVersion())
+ .append("nfsRetrans", getNfsRetrans())
+ .append("nfsTimeo", getNfsTimeo())
+ .append("iface", getIface())
+ .append("netIfaceName", getNetIfaceName())
+ .build();
}
public Short getNfsRetrans() {
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/StorageDevice.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/StorageDevice.java
index cf88451..bf75d32 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/StorageDevice.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/StorageDevice.java
@@ -3,6 +3,7 @@
import org.ovirt.engine.core.common.businessentities.BusinessEntity;
import org.ovirt.engine.core.common.businessentities.IVdcQueryable;
import org.ovirt.engine.core.common.utils.ObjectUtils;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
/*
@@ -171,9 +172,19 @@
@Override
public String toString() {
- return "StorageDevice [id=" + id + ", name=" + name + ", devUuid=" +
devUuid + ", fsUuid=" + fsUuid
- + ", vdsId=" + vdsId + ", description=" + description + ",
devType=" + devType + ", devPath=" + devPath
- + ", fsType=" + fsType + ", mountPoint=" + mountPoint + ",
size=" + size + ", canCreateBrick="
- + canCreateBrick + "]";
+ return ToStringBuilder.forInstance(this)
+ .append("id", id)
+ .append("name", name)
+ .append("devUuid", devUuid)
+ .append("fsUuid", fsUuid)
+ .append("vdsId", vdsId)
+ .append("description", description)
+ .append("devType", devType)
+ .append("devPath", devPath)
+ .append("fsType", fsType)
+ .append("mountPoint", mountPoint)
+ .append("size", size)
+ .append("canCreateBrick", canCreateBrick)
+ .build();
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage/CinderVolumeType.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage/CinderVolumeType.java
index 3243c77..51571bd 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage/CinderVolumeType.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage/CinderVolumeType.java
@@ -3,6 +3,8 @@
import java.io.Serializable;
import java.util.Map;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
+
public class CinderVolumeType implements Serializable {
private String id;
@@ -58,7 +60,11 @@
*/
@Override
public String toString() {
- return "Snapshot [id=" + id + ", name=" + name + ", extra_specs=" +
extraSpecs + "]";
+ return ToStringBuilder.forInstance(this)
+ .append("id", id)
+ .append("name", name)
+ .append("extra_specs", extraSpecs)
+ .build();
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage/LUNs.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage/LUNs.java
index 29648b9..ee66a66 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage/LUNs.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage/LUNs.java
@@ -9,6 +9,7 @@
import org.ovirt.engine.core.common.businessentities.BusinessEntity;
import org.ovirt.engine.core.common.businessentities.StorageServerConnections;
import org.ovirt.engine.core.common.utils.ObjectUtils;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class LUNs implements BusinessEntity<String> {
@@ -289,43 +290,25 @@
@Override
public String toString() {
- StringBuilder builder = new StringBuilder();
- builder.append("LUNs [id=")
- .append(getLUN_id())
- .append(", physicalVolumeId=")
- .append(getphysical_volume_id())
- .append(", volumeGroupId=")
- .append(getvolume_group_id())
- .append(", serial=")
- .append(getSerial())
- .append(", lunMapping=")
- .append(getLunMapping())
- .append(", vendorId=")
- .append(getVendorId())
- .append(", productId=")
- .append(getProductId())
- .append(", _lunConnections=")
- .append(getLunConnections())
- .append(", deviceSize=")
- .append(getDeviceSize())
- .append(", vendorName=")
- .append(getVendorName())
- .append(", pathsDictionary=")
- .append(getPathsDictionary())
- .append(", lunType=")
- .append(getLunType())
- .append(", status=")
- .append(getStatus())
- .append(", diskId=")
- .append(getDiskId())
- .append(", diskAlias=")
- .append(getDiskAlias())
- .append(", storageDomainId=")
- .append(getStorageDomainId())
- .append(", storageDomainName=")
- .append(getStorageDomainName())
- .append("]");
- return builder.toString();
+ return ToStringBuilder.forInstance(this)
+ .append("id", getLUN_id())
+ .append("physicalVolumeId", getphysical_volume_id())
+ .append("volumeGroupId", getvolume_group_id())
+ .append("serial", getSerial())
+ .append("lunMapping", getLunMapping())
+ .append("vendorId", getVendorId())
+ .append("productId", getProductId())
+ .append("lunConnections", getLunConnections())
+ .append("deviceSize", getDeviceSize())
+ .append("vendorName", getVendorName())
+ .append("pathsDictionary", getPathsDictionary())
+ .append("lunType", getLunType())
+ .append("status", getStatus())
+ .append("diskId", getDiskId())
+ .append("diskAlias", getDiskAlias())
+ .append("storageDomainId", getStorageDomainId())
+ .append("storageDomainName", getStorageDomainName())
+ .build();
}
@Override
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage/OpenStackVolumeProviderProperties.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage/OpenStackVolumeProviderProperties.java
index b22d8ff..15e9722 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage/OpenStackVolumeProviderProperties.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/storage/OpenStackVolumeProviderProperties.java
@@ -44,15 +44,4 @@
result = 31 * result + (storagePoolId != null ?
storagePoolId.hashCode() : 0);
return result;
}
-
- @Override
- public String toString() {
- StringBuilder builder = new StringBuilder();
- builder.append("OpenStackVolumeProviderProperties [pluginType=")
- .append(", tenantName=")
- .append(getTenantName())
- .append("]");
- return builder.toString();
- }
-
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/AllStorageAndImageIdVDSCommandParametersBase.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/AllStorageAndImageIdVDSCommandParametersBase.java
index af2486f..8bae11c 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/AllStorageAndImageIdVDSCommandParametersBase.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/AllStorageAndImageIdVDSCommandParametersBase.java
@@ -1,5 +1,6 @@
package org.ovirt.engine.core.common.vdscommands;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class AllStorageAndImageIdVDSCommandParametersBase extends
StoragePoolDomainAndGroupIdBaseVDSCommandParameters {
@@ -20,7 +21,8 @@
}
@Override
- public String toString() {
- return String.format("%s, imageId = %s", super.toString(),
getImageId());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("imageId", getImageId());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ChangeDiskVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ChangeDiskVDSCommandParameters.java
index e3e1402..d513db6 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ChangeDiskVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ChangeDiskVDSCommandParameters.java
@@ -1,5 +1,6 @@
package org.ovirt.engine.core.common.vdscommands;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class ChangeDiskVDSCommandParameters extends
VdsAndVmIDVDSParametersBase {
@@ -18,7 +19,8 @@
}
@Override
- public String toString() {
- return String.format("%s, diskPath=%s", super.toString(),
getDiskPath());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("diskPath", getDiskPath());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ConnectStoragePoolVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ConnectStoragePoolVDSCommandParameters.java
index e4f6d77..0caf341 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ConnectStoragePoolVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ConnectStoragePoolVDSCommandParameters.java
@@ -1,11 +1,12 @@
package org.ovirt.engine.core.common.vdscommands;
+import java.util.List;
+
import org.ovirt.engine.core.common.businessentities.StoragePool;
import org.ovirt.engine.core.common.businessentities.StoragePoolIsoMap;
import org.ovirt.engine.core.common.businessentities.VDS;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
-
-import java.util.List;
public class ConnectStoragePoolVDSCommandParameters extends
VdsIdVDSCommandParametersBase {
@@ -74,9 +75,10 @@
}
@Override
- public String toString() {
- return String.format("%s, vdsId = %s, storagePoolId = %s,
masterVersion = %d",
- super.toString(), vds.getId().toString(),
storagePool.getId().toString(),
- storagePool.getMasterDomainVersion());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("vdsId", vds.getId())
+ .append("storagePoolId", storagePool.getId())
+ .append("masterVersion", storagePool.getMasterDomainVersion());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CopyImageVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CopyImageVDSCommandParameters.java
index 592c885..bc06970 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CopyImageVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CopyImageVDSCommandParameters.java
@@ -3,6 +3,7 @@
import org.ovirt.engine.core.common.businessentities.storage.CopyVolumeType;
import org.ovirt.engine.core.common.businessentities.storage.VolumeFormat;
import org.ovirt.engine.core.common.businessentities.storage.VolumeType;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class CopyImageVDSCommandParameters
@@ -136,20 +137,17 @@
}
@Override
- public String toString() {
- return String.format("%s, dstImageGroupId = %s, vmId = %s, dstImageId
= %s, imageDescription = %s, " +
- "dstStorageDomainId = %s, copyVolumeType = %s, volumeFormat =
%s, preallocate = %s, postZero = %s, " +
- "force = %s",
- super.toString(),
- getdstImageGroupId(),
- getVmId(),
- getDstImageId(),
- getImageDescription(),
- getDstStorageDomainId(),
- getCopyVolumeType(),
- getVolumeFormat(),
- getPreallocate(),
- getPostZero(),
- getForce());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("dstImageGroupId", getdstImageGroupId())
+ .append("vmId", getVmId())
+ .append("dstImageId", getDstImageId())
+ .append("imageDescription", getImageDescription())
+ .append("dstStorageDomainId", getDstStorageDomainId())
+ .append("copyVolumeType", getCopyVolumeType())
+ .append("volumeFormat", getVolumeFormat())
+ .append("preallocate", getPreallocate())
+ .append("postZero", getPostZero())
+ .append("force", getForce());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateImageVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateImageVDSCommandParameters.java
index 3cbe898..bc33a2d 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateImageVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateImageVDSCommandParameters.java
@@ -2,6 +2,7 @@
import org.ovirt.engine.core.common.businessentities.storage.VolumeFormat;
import org.ovirt.engine.core.common.businessentities.storage.VolumeType;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class CreateImageVDSCommandParameters extends
StoragePoolDomainAndGroupIdBaseVDSCommandParameters {
@@ -64,13 +65,11 @@
}
@Override
- public String toString() {
- return String.format("%s, imageSizeInBytes = %s, volumeFormat = %s,
newImageId = %s, " +
- "newImageDescription = %s",
- super.toString(),
- getImageSizeInBytes(),
- getVolumeFormat(),
- getNewImageID(),
- getNewImageDescription());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("imageSizeInBytes", getImageSizeInBytes())
+ .append("volumeFormat", getVolumeFormat())
+ .append("newImageId", getNewImageID())
+ .append("newImageDescription", getNewImageDescription());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateSnapshotVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateSnapshotVDSCommandParameters.java
index e56fd0f..3d2e200 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateSnapshotVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateSnapshotVDSCommandParameters.java
@@ -2,6 +2,7 @@
import org.ovirt.engine.core.common.businessentities.storage.VolumeFormat;
import org.ovirt.engine.core.common.businessentities.storage.VolumeType;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class CreateSnapshotVDSCommandParameters extends
CreateImageVDSCommandParameters {
@@ -35,10 +36,9 @@
}
@Override
- public String toString() {
- return String.format("%s, imageId = %s, sourceImageGroupId = %s",
- super.toString(),
- getImageId(),
- getSourceImageGroupId());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("imageId", getImageId())
+ .append("sourceImageGroupId", getSourceImageGroupId());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateStorageDomainVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateStorageDomainVDSCommandParameters.java
index 5eb37bd..5fb9870 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateStorageDomainVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateStorageDomainVDSCommandParameters.java
@@ -1,6 +1,7 @@
package org.ovirt.engine.core.common.vdscommands;
import org.ovirt.engine.core.common.businessentities.StorageDomainStatic;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class CreateStorageDomainVDSCommandParameters extends
VdsIdVDSCommandParametersBase {
@@ -34,9 +35,9 @@
}
@Override
- public String toString() {
- return String.format("%s, storageDomain=%s, args=%s",
super.toString(), getStorageDomain(), getArgs());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("storageDomain", getStorageDomain())
+ .append("args", getArgs());
}
-
-
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateStoragePoolVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateStoragePoolVDSCommandParameters.java
index e6748e2..59110a9 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateStoragePoolVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateStoragePoolVDSCommandParameters.java
@@ -2,6 +2,7 @@
import java.util.List;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class CreateStoragePoolVDSCommandParameters extends
VdsIdVDSCommandParametersBase {
@@ -71,15 +72,12 @@
}
@Override
- public String toString() {
- return String.format("%s, storagePoolId=%s, storagePoolName=%s,
masterDomainId=%s, " +
- "domainsIdList=%s, masterVersion=%s",
- super.toString(),
- getStoragePoolId(),
- getStoragePoolName(),
- getMasterDomainId(),
- getDomainsIdList(),
- getMasterVersion());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("storagePoolId", getStoragePoolId())
+ .append("storagePoolName", getStoragePoolName())
+ .append("masterDomainId", getMasterDomainId())
+ .append("domainsIdList", getDomainsIdList())
+ .append("masterVersion", getMasterVersion());
}
-
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateVGVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateVGVDSCommandParameters.java
index bdbe953..dabf004 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateVGVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateVGVDSCommandParameters.java
@@ -3,6 +3,7 @@
import java.util.ArrayList;
import java.util.List;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class CreateVGVDSCommandParameters extends
ValidateStorageDomainVDSCommandParameters {
@@ -36,7 +37,9 @@
}
@Override
- public String toString() {
- return String.format("%s, deviceList=%s, force=%b", super.toString(),
getDeviceList(), isForce());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("deviceList", getDeviceList())
+ .append("force", isForce());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DeactivateStorageDomainVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DeactivateStorageDomainVDSCommandParameters.java
index 87e23f6..d49ce0a 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DeactivateStorageDomainVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DeactivateStorageDomainVDSCommandParameters.java
@@ -1,5 +1,6 @@
package org.ovirt.engine.core.common.vdscommands;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class DeactivateStorageDomainVDSCommandParameters extends
ActivateStorageDomainVDSCommandParameters {
@@ -35,8 +36,9 @@
}
@Override
- public String toString() {
- return String.format("%s, masterDomainId = %s, masterVersion = %s",
super.toString(),
- getMasterStorageDomainId(), getMasterVersion());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("masterDomainId", getMasterStorageDomainId())
+ .append("masterVersion", getMasterVersion());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DeleteImageGroupVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DeleteImageGroupVDSCommandParameters.java
index 1df60c6..4936074 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DeleteImageGroupVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DeleteImageGroupVDSCommandParameters.java
@@ -1,5 +1,6 @@
package org.ovirt.engine.core.common.vdscommands;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class DeleteImageGroupVDSCommandParameters
@@ -35,10 +36,9 @@
}
@Override
- public String toString() {
- return String.format("%s, postZeros = %s, forceDelete = %s",
- super.toString(),
- getPostZero(),
- getForceDelete());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("postZeros", getPostZero())
+ .append("forceDelete", getForceDelete());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DestroyImageVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DestroyImageVDSCommandParameters.java
index 354245f..7d02cf3 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DestroyImageVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DestroyImageVDSCommandParameters.java
@@ -2,6 +2,7 @@
import java.util.List;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class DestroyImageVDSCommandParameters
@@ -48,12 +49,12 @@
public DestroyImageVDSCommandParameters() {
}
+
@Override
- public String toString() {
- return String.format("%s, imageList = %s, postZero = %s, force = %s",
- super.toString(),
- getImageList(),
- getPostZero(),
- getForce());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("imageList", getImageList())
+ .append("postZero", getPostZero())
+ .append("force", getForce());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DetachStorageDomainVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DetachStorageDomainVDSCommandParameters.java
index 83e1628..f5f0684 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DetachStorageDomainVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DetachStorageDomainVDSCommandParameters.java
@@ -1,5 +1,6 @@
package org.ovirt.engine.core.common.vdscommands;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class DetachStorageDomainVDSCommandParameters extends
DeactivateStorageDomainVDSCommandParameters {
@@ -32,7 +33,8 @@
}
@Override
- public String toString() {
- return String.format("%s, force = %s", super.toString(), getForce());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("force", getForce());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DisconnectStoragePoolVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DisconnectStoragePoolVDSCommandParameters.java
index 714466a..0b302b3 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DisconnectStoragePoolVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DisconnectStoragePoolVDSCommandParameters.java
@@ -1,5 +1,6 @@
package org.ovirt.engine.core.common.vdscommands;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class DisconnectStoragePoolVDSCommandParameters extends
GetStorageConnectionsListVDSCommandParameters {
@@ -22,7 +23,8 @@
}
@Override
- public String toString() {
- return String.format("%s, vds_spm_id = %s", super.toString(),
getvds_spm_id());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("vds_spm_id", getvds_spm_id());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ExtendStorageDomainVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ExtendStorageDomainVDSCommandParameters.java
index b727034..cb9c4d0 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ExtendStorageDomainVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ExtendStorageDomainVDSCommandParameters.java
@@ -2,6 +2,7 @@
import java.util.ArrayList;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class ExtendStorageDomainVDSCommandParameters extends
ActivateStorageDomainVDSCommandParameters {
@@ -47,7 +48,8 @@
}
@Override
- public String toString() {
- return String.format("%s, deviceList = %s", super.toString(),
getDeviceList());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("deviceList", getDeviceList());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetDeviceListVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetDeviceListVDSCommandParameters.java
index 69508b2..2514bfb 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetDeviceListVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetDeviceListVDSCommandParameters.java
@@ -1,6 +1,7 @@
package org.ovirt.engine.core.common.vdscommands;
import org.ovirt.engine.core.common.businessentities.storage.StorageType;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class GetDeviceListVDSCommandParameters extends
VdsIdVDSCommandParametersBase {
@@ -24,7 +25,8 @@
}
@Override
- public String toString() {
- return String.format("%s, storageType=%s", super.toString(),
getStorageType());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("storageType", getStorageType());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetImagesListVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetImagesListVDSCommandParameters.java
index e23eddd..a9046d2 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetImagesListVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetImagesListVDSCommandParameters.java
@@ -1,5 +1,6 @@
package org.ovirt.engine.core.common.vdscommands;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class GetImagesListVDSCommandParameters extends
IrsBaseVDSCommandParameters {
@@ -23,7 +24,8 @@
}
@Override
- public String toString() {
- return String.format("%s, sdUUID = %s", super.toString(),
getStorageDomainId());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("sdUUID", getStorageDomainId());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetStorageConnectionsListVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetStorageConnectionsListVDSCommandParameters.java
index 096f27e..21e5c03 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetStorageConnectionsListVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetStorageConnectionsListVDSCommandParameters.java
@@ -1,5 +1,6 @@
package org.ovirt.engine.core.common.vdscommands;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class GetStorageConnectionsListVDSCommandParameters extends
VdsIdVDSCommandParametersBase {
@@ -23,7 +24,8 @@
}
@Override
- public String toString() {
- return String.format("%s, storagePoolId = %s", super.toString(),
getStoragePoolId());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("storagePoolId", getStoragePoolId());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetVGInfoVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetVGInfoVDSCommandParameters.java
index 6298e7f..0309ab6 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetVGInfoVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetVGInfoVDSCommandParameters.java
@@ -1,5 +1,6 @@
package org.ovirt.engine.core.common.vdscommands;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class GetVGInfoVDSCommandParameters extends
VdsIdVDSCommandParametersBase {
@@ -22,7 +23,8 @@
}
@Override
- public String toString() {
- return String.format("%s, VGID=%s", super.toString(), getVGID());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("VGID", getVGID());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HSMGetIsoListParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HSMGetIsoListParameters.java
index 6f79d21..a423440 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HSMGetIsoListParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HSMGetIsoListParameters.java
@@ -1,5 +1,6 @@
package org.ovirt.engine.core.common.vdscommands;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class HSMGetIsoListParameters extends VdsIdVDSCommandParametersBase {
@@ -23,7 +24,8 @@
}
@Override
- public String toString() {
- return String.format("%s, storagePoolId=%s", super.toString(),
getStoragePoolId());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("storagePoolId", getStoragePoolId());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HSMGetStorageDomainsListVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HSMGetStorageDomainsListVDSCommandParameters.java
index 26c4bd6..08c0851 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HSMGetStorageDomainsListVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HSMGetStorageDomainsListVDSCommandParameters.java
@@ -2,6 +2,7 @@
import org.ovirt.engine.core.common.businessentities.StorageDomainType;
import org.ovirt.engine.core.common.businessentities.storage.StorageType;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class HSMGetStorageDomainsListVDSCommandParameters extends
VdsIdVDSCommandParametersBase {
@@ -61,12 +62,11 @@
}
@Override
- public String toString() {
- return String.format("%s, storagePoolId=%s, storageType=%s,
storageDomainType=%s, path=%s",
- super.toString(),
- getStoragePoolId(),
- getStorageType(),
- getStorageDomainType(),
- getPath());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("storagePoolId", getStoragePoolId())
+ .append("storageType", getStorageType())
+ .append("storageDomainType", getStorageDomainType())
+ .append("path", getPath());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HSMTaskGuidBaseVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HSMTaskGuidBaseVDSCommandParameters.java
index 9beeb05..2597086 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HSMTaskGuidBaseVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HSMTaskGuidBaseVDSCommandParameters.java
@@ -1,5 +1,6 @@
package org.ovirt.engine.core.common.vdscommands;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class HSMTaskGuidBaseVDSCommandParameters extends
VdsIdVDSCommandParametersBase {
@@ -23,7 +24,8 @@
}
@Override
- public String toString() {
- return String.format("%s, taskId=%s", super.toString(), getTaskId());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("taskId", getTaskId());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HotPlugDiskVDSParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HotPlugDiskVDSParameters.java
index b3db65f..f5ae36d 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HotPlugDiskVDSParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HotPlugDiskVDSParameters.java
@@ -3,6 +3,7 @@
import org.ovirt.engine.core.common.businessentities.VM;
import org.ovirt.engine.core.common.businessentities.VmDevice;
import org.ovirt.engine.core.common.businessentities.storage.Disk;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class HotPlugDiskVDSParameters extends VdsAndVmIDVDSParametersBase {
@@ -46,7 +47,8 @@
}
@Override
- public String toString() {
- return String.format("%s, diskId = %s", super.toString(),
disk.getId());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("diskId", disk.getId());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/IrsBaseVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/IrsBaseVDSCommandParameters.java
index 3d2d38f..c6e2f9b 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/IrsBaseVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/IrsBaseVDSCommandParameters.java
@@ -1,5 +1,6 @@
package org.ovirt.engine.core.common.vdscommands;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class IrsBaseVDSCommandParameters extends VDSParametersBase {
@@ -31,8 +32,9 @@
}
@Override
- public String toString() {
- return String.format("storagePoolId = %s, ignoreFailoverLimit = %s",
- getStoragePoolId(), getIgnoreFailoverLimit());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("storagePoolId", getStoragePoolId())
+ .append("ignoreFailoverLimit", getIgnoreFailoverLimit());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MergeSnapshotsVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MergeSnapshotsVDSCommandParameters.java
index 7f58585..254db7e 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MergeSnapshotsVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MergeSnapshotsVDSCommandParameters.java
@@ -1,5 +1,6 @@
package org.ovirt.engine.core.common.vdscommands;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class MergeSnapshotsVDSCommandParameters
@@ -46,11 +47,10 @@
}
@Override
- public String toString() {
- return String.format("%s, imageId2 = %s, vmId = %s, postZero = %s",
- super.toString(),
- getImageId2(),
- getVmId(),
- getPostZero());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("imageId2", getImageId2())
+ .append("vmId", getVmId())
+ .append("postZero", getPostZero());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MergeVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MergeVDSCommandParameters.java
index aa90220..0b1d767 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MergeVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MergeVDSCommandParameters.java
@@ -3,6 +3,7 @@
import java.util.HashMap;
import java.util.Map;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class MergeVDSCommandParameters extends VdsAndVmIDVDSParametersBase {
@@ -102,16 +103,14 @@
}
@Override
- public String toString() {
- return new StringBuilder("MergeVDSCommandParameters{")
- .append(super.toString())
- .append(", storagePoolId=").append(storagePoolId)
- .append(", storageDomainId=").append(storageDomainId)
- .append(", imageGroupId=").append(imageGroupId)
- .append(", imageId=").append(imageId)
- .append(", baseImageId=").append(baseImageId)
- .append(", topImageId=").append(topImageId)
- .append(", bandwidth=").append(bandwidth)
- .append('}').toString();
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("storagePoolId", storagePoolId)
+ .append("storageDomainId", storageDomainId)
+ .append("imageGroupId", imageGroupId)
+ .append("imageId", imageId)
+ .append("baseImageId", baseImageId)
+ .append("topImageId", topImageId)
+ .append("bandwidth", bandwidth);
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MoveImageGroupVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MoveImageGroupVDSCommandParameters.java
index 7f97974..2766b29 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MoveImageGroupVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MoveImageGroupVDSCommandParameters.java
@@ -1,6 +1,7 @@
package org.ovirt.engine.core.common.vdscommands;
import org.ovirt.engine.core.common.businessentities.storage.ImageOperation;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class MoveImageGroupVDSCommandParameters
@@ -62,12 +63,11 @@
}
@Override
- public String toString() {
- return String.format("%s, vmId = %s, op = %s, postZero = %s, force =
%s",
- super.toString(),
- getVmId(),
- getOp(),
- getPostZero(),
- getForce());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("vmId", getVmId())
+ .append("op", getOp())
+ .append("postZero", getPostZero())
+ .append("force", getForce());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ReconstructMasterVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ReconstructMasterVDSCommandParameters.java
index fb42892..7f70689 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ReconstructMasterVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ReconstructMasterVDSCommandParameters.java
@@ -3,6 +3,7 @@
import java.util.List;
import org.ovirt.engine.core.common.businessentities.StoragePoolIsoMap;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class ReconstructMasterVDSCommandParameters extends
VdsIdVDSCommandParametersBase {
@@ -83,20 +84,6 @@
privateMasterDomainId = Guid.Empty;
}
- @Override
- public String toString() {
- return String.format("%s, vdsSpmId = %d, storagePoolId = %s, "
- + "storagePoolName = %s, masterDomainId = %s, masterVersion =
%s, "
- + "domainsList = [%s]",
- super.toString(),
- getVdsSpmId(),
- getStoragePoolId(),
- getStoragePoolName(),
- getMasterDomainId(),
- getMasterVersion(),
- getPrintableDomainsList());
- }
-
private String getPrintableDomainsList() {
StringBuilder sb = new StringBuilder();
for (StoragePoolIsoMap map : getDomainsList()) {
@@ -108,4 +95,15 @@
}
return sb.toString();
}
+
+ @Override
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("vdsSpmId", getVdsSpmId())
+ .append("storagePoolId", getStoragePoolId())
+ .append("storagePoolName", getStoragePoolName())
+ .append("masterDomainId", getMasterDomainId())
+ .append("masterVersion", getMasterVersion())
+ .append("domainsList", getPrintableDomainsList());
+ }
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ResetIrsVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ResetIrsVDSCommandParameters.java
index 16d71c3..23ddc53 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ResetIrsVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ResetIrsVDSCommandParameters.java
@@ -1,5 +1,6 @@
package org.ovirt.engine.core.common.vdscommands;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class ResetIrsVDSCommandParameters extends IrsBaseVDSCommandParameters {
@@ -58,10 +59,9 @@
}
@Override
- public String toString() {
- return String.format("%s, vdsId = %s, ignoreStopFailed = %s",
- super.toString(),
- getVdsId(),
- getIgnoreStopFailed());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("vdsId", getVdsId())
+ .append("ignoreStopFailed", getIgnoreStopFailed());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SPMTaskGuidBaseVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SPMTaskGuidBaseVDSCommandParameters.java
index a8f98cc..53e5f6d 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SPMTaskGuidBaseVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SPMTaskGuidBaseVDSCommandParameters.java
@@ -1,5 +1,6 @@
package org.ovirt.engine.core.common.vdscommands;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class SPMTaskGuidBaseVDSCommandParameters extends
IrsBaseVDSCommandParameters {
@@ -23,7 +24,8 @@
}
@Override
- public String toString() {
- return String.format("%s, taskId = %s", super.toString(), getTaskId());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("taskId", getTaskId());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetStorageDomainDescriptionVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetStorageDomainDescriptionVDSCommandParameters.java
index a35c0c5..4d09af8 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetStorageDomainDescriptionVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetStorageDomainDescriptionVDSCommandParameters.java
@@ -1,5 +1,6 @@
package org.ovirt.engine.core.common.vdscommands;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class SetStorageDomainDescriptionVDSCommandParameters extends
ActivateStorageDomainVDSCommandParameters {
@@ -22,7 +23,8 @@
}
@Override
- public String toString() {
- return String.format("%s, description = %s", super.toString(),
getDescription());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("description", getDescription());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SpmStartVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SpmStartVDSCommandParameters.java
index 28d8d06..6c6e996 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SpmStartVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SpmStartVDSCommandParameters.java
@@ -2,6 +2,7 @@
import org.ovirt.engine.core.common.businessentities.RecoveryMode;
import org.ovirt.engine.core.common.businessentities.StorageFormatType;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class SpmStartVDSCommandParameters extends
GetStorageConnectionsListVDSCommandParameters {
@@ -70,13 +71,12 @@
}
@Override
- public String toString() {
- return String.format("%s, prevId=%s, prevLVER=%s,
storagePoolFormatType=%s, recoveryMode=%s, SCSIFencing=%s",
- super.toString(),
- getPrevId(),
- getPrevLVER(),
- getStoragePoolFormatType(),
- getRecoveryMode(),
- getSCSIFencing());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("prevId", getPrevId())
+ .append("prevLVER", getPrevLVER())
+ .append("storagePoolFormatType", getStoragePoolFormatType())
+ .append("recoveryMode", getRecoveryMode())
+ .append("SCSIFencing", getSCSIFencing());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/StorageDomainIdParametersBase.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/StorageDomainIdParametersBase.java
index 03ca82d..73ad860 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/StorageDomainIdParametersBase.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/StorageDomainIdParametersBase.java
@@ -1,5 +1,6 @@
package org.ovirt.engine.core.common.vdscommands;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
/**
@@ -28,7 +29,8 @@
}
@Override
- public String toString() {
- return String.format("%s, storageDomainId = %s", super.toString(),
getStorageDomainId());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("storageDomainId", getStorageDomainId());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/StoragePoolDomainAndGroupIdBaseVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/StoragePoolDomainAndGroupIdBaseVDSCommandParameters.java
index e2e00ae..573d4c1 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/StoragePoolDomainAndGroupIdBaseVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/StoragePoolDomainAndGroupIdBaseVDSCommandParameters.java
@@ -1,5 +1,6 @@
package org.ovirt.engine.core.common.vdscommands;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class StoragePoolDomainAndGroupIdBaseVDSCommandParameters extends
StorageDomainIdParametersBase {
@@ -25,7 +26,8 @@
}
@Override
- public String toString() {
- return String.format("%s, imageGroupId = %s", super.toString(),
getImageGroupId());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("imageGroupId", getImageGroupId());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/StorageServerConnectionManagementVDSParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/StorageServerConnectionManagementVDSParameters.java
index 09d292c..ee9f5d5 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/StorageServerConnectionManagementVDSParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/StorageServerConnectionManagementVDSParameters.java
@@ -4,6 +4,7 @@
import org.ovirt.engine.core.common.businessentities.StorageServerConnections;
import org.ovirt.engine.core.common.businessentities.storage.StorageType;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class StorageServerConnectionManagementVDSParameters extends
GetStorageConnectionsListVDSCommandParameters {
@@ -39,16 +40,9 @@
}
@Override
- public String toString() {
- return String.format("%s, storageType = %s, connectionList = [%s]",
- super.toString(), getStorageType().name(),
getPrintableConnectionsList());
- }
-
- private String getPrintableConnectionsList() {
- StringBuilder sb = new StringBuilder();
- for (StorageServerConnections con : getConnectionList()) {
- sb.append(con);
- }
- return sb.toString();
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("storageType", getStorageType())
+ .append("connectionList", getConnectionList());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SyncImageGroupDataVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SyncImageGroupDataVDSCommandParameters.java
index ac3a8dd..195e452 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SyncImageGroupDataVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SyncImageGroupDataVDSCommandParameters.java
@@ -1,5 +1,6 @@
package org.ovirt.engine.core.common.vdscommands;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class SyncImageGroupDataVDSCommandParameters extends
TargetDomainImageGroupVDSCommandParameters {
@@ -28,7 +29,8 @@
}
@Override
- public String toString() {
- return String.format("%s, syncType=%s", super.toString(),
getSyncType());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("syncType", getSyncType());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/TargetDomainImageGroupVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/TargetDomainImageGroupVDSCommandParameters.java
index 385f05e..33a5233 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/TargetDomainImageGroupVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/TargetDomainImageGroupVDSCommandParameters.java
@@ -1,5 +1,6 @@
package org.ovirt.engine.core.common.vdscommands;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class TargetDomainImageGroupVDSCommandParameters extends
StoragePoolDomainAndGroupIdBaseVDSCommandParameters {
@@ -27,7 +28,8 @@
}
@Override
- public String toString() {
- return String.format("%s, dstDomainId = %s", super.toString(),
getDstDomainId());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("dstDomainId", getDstDomainId());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/UpgradeStoragePoolVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/UpgradeStoragePoolVDSCommandParameters.java
index f991d09..b6ba335 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/UpgradeStoragePoolVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/UpgradeStoragePoolVDSCommandParameters.java
@@ -1,6 +1,7 @@
package org.ovirt.engine.core.common.vdscommands;
import org.ovirt.engine.core.common.businessentities.StorageFormatType;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class UpgradeStoragePoolVDSCommandParameters extends
IrsBaseVDSCommandParameters {
@@ -22,8 +23,9 @@
}
@Override
- public String toString() {
- return String.format("storagePoolId = %s, poolVersion = %s",
- getStoragePoolId(), getCompatibilityVersion());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("storagePoolId", getStoragePoolId())
+ .append("poolVersion ", getCompatibilityVersion());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VdsAndPoolIDVDSParametersBase.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VdsAndPoolIDVDSParametersBase.java
index e7517e0..d6f7aec 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VdsAndPoolIDVDSParametersBase.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VdsAndPoolIDVDSParametersBase.java
@@ -1,5 +1,6 @@
package org.ovirt.engine.core.common.vdscommands;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class VdsAndPoolIDVDSParametersBase extends
VdsIdVDSCommandParametersBase {
@@ -19,7 +20,8 @@
}
@Override
- public String toString() {
- return String.format("%s, storagePoolId=%s", super.toString(),
getStoragePoolId());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("storagePoolId", getStoragePoolId());
}
}
--
To view, visit https://gerrit.ovirt.org/39983
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: Ia7787007a0cb30aa391ef3bddbecc997e81a76d3
Gerrit-PatchSet: 1
Gerrit-Project: ovirt-engine
Gerrit-Branch: master
Gerrit-Owner: Martin Peřina <mper...@redhat.com>
_______________________________________________
Engine-patches mailing list
Engine-patches@ovirt.org
http://lists.ovirt.org/mailman/listinfo/engine-patches
