Martin Peřina has uploaded a new change for review.
Change subject: core: Use ToStringBuilder in virt classes
......................................................................
core: Use ToStringBuilder in virt classes
Refactor existing toString() methods to use ToStringBuilder in virt
classes.
Change-Id: I613b765acfdde6be3645febc600947ffca9cb358
Signed-off-by: Martin Perina <mper...@redhat.com>
---
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/HostDevice.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/HostDeviceId.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDevice.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDeviceId.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmGuestAgentInterface.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateVmVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DestroyVmVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DiscoverSendTargetsVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetVmsFromExternalProviderParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetVmsInfoVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HostDevChangeNumVfsVDSParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/IsVmDuringInitiatingVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MigrateVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/RemoveVMVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetVmStatusVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetVmTicketVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/StartSpiceVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/UpdateVMVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/UpdateVmDynamicDataVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VmLogoffVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VmLogonVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VmNicDeviceVDSParameters.java
22 files changed, 150 insertions(+), 139 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/79/39979/1
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/HostDevice.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/HostDevice.java
index 5b506fc..aa4ac63 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/HostDevice.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/HostDevice.java
@@ -1,6 +1,7 @@
package org.ovirt.engine.core.common.businessentities;
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 HostDevice implements BusinessEntity<HostDeviceId> {
@@ -178,21 +179,20 @@
@Override
public String toString() {
- return String.format("HostDevice{hostId=%s, deviceName='%s',
parentDeviceName='%s', capability='%s', iommuGroup=%d, "
- +
- "productName='%s', productId='%s', vendorName='%s',
vendorId='%s', parentPhysicalFunction='%s', totalVirtualFunctions=%s,
networkInterfaceName='%s', vmId=%s}",
- hostId,
- deviceName,
- parentDeviceName,
- capability,
- iommuGroup,
- productName,
- productId,
- vendorName,
- vendorId,
- parentPhysicalFunction,
- totalVirtualFunctions,
- networkInterfaceName,
- vmId);
+ return ToStringBuilder.forInstance(this)
+ .append("hostId", hostId)
+ .append("deviceName", deviceName)
+ .append("parentDeviceName", parentDeviceName)
+ .append("capability", capability)
+ .append("iommuGroup", iommuGroup)
+ .append("productName", productName)
+ .append("productId", productId)
+ .append("vendorName", vendorName)
+ .append("vendorId", vendorId)
+ .append("parentPhysicalFunction", parentPhysicalFunction)
+ .append("totalVirtualFunctions", totalVirtualFunctions)
+ .append("networkInterfaceName", networkInterfaceName)
+ .append("vmId", vmId)
+ .build();
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/HostDeviceId.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/HostDeviceId.java
index bc26213..bfd7de8 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/HostDeviceId.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/HostDeviceId.java
@@ -1,9 +1,10 @@
package org.ovirt.engine.core.common.businessentities;
-import org.ovirt.engine.core.common.utils.ObjectUtils;
-import org.ovirt.engine.core.compat.Guid;
-
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 final class HostDeviceId implements Serializable,
Comparable<HostDeviceId> {
@@ -58,7 +59,10 @@
@Override
public String toString() {
- return String.format("hostId = %s, deviceName = %s", getHostId(),
getDeviceName());
+ return ToStringBuilder.forInstance(this)
+ .append("hostId", getHostId())
+ .append("deviceName", getDeviceName())
+ .build();
}
@Override
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDevice.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDevice.java
index 8ac4514..ff11b05 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDevice.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDevice.java
@@ -4,6 +4,7 @@
import
org.ovirt.engine.core.common.businessentities.comparators.BusinessEntityComparator;
import org.ovirt.engine.core.common.utils.ObjectUtils;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
/**
@@ -292,37 +293,21 @@
@Override
public String toString() {
- StringBuilder sb = new StringBuilder("VmDevice {");
- sb.append("vmId=");
- sb.append(id.getVmId());
- sb.append(", deviceId=");
- sb.append(id.getDeviceId());
- sb.append(", device=");
- sb.append(getDevice());
- sb.append(", type=");
- sb.append(getType());
- sb.append(", bootOrder=");
- sb.append(getBootOrder());
- sb.append(", specParams=");
- sb.append(getSpecParams());
- sb.append(", address=");
- sb.append(getAddress());
- sb.append(", managed=");
- sb.append(getIsManaged());
- sb.append(", plugged=");
- sb.append(getIsPlugged());
- sb.append(", readOnly=");
- sb.append(getIsReadOnly());
- sb.append(", deviceAlias=");
- sb.append(getAlias());
- sb.append(", customProperties=");
- sb.append(getCustomProperties());
- sb.append(", snapshotId=");
- sb.append(getSnapshotId());
- sb.append(", logicalName=");
- sb.append(getLogicalName());
- sb.append("}");
- return sb.toString();
+ return ToStringBuilder.forInstance(this)
+ .append("id", id)
+ .append("device", getDevice())
+ .append("type", getType())
+ .append("bootOrder", getBootOrder())
+ .append("specParams", getSpecParams())
+ .append("address", getAddress())
+ .append("managed", getIsManaged())
+ .append("plugged", getIsPlugged())
+ .append("readOnly", getIsReadOnly())
+ .append("deviceAlias", getAlias())
+ .append("customProperties", getCustomProperties())
+ .append("snapshotId", getSnapshotId())
+ .append("logicalName", getLogicalName())
+ .build();
}
@Override
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDeviceId.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDeviceId.java
index febe89c..2b4695d 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDeviceId.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmDeviceId.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 VmDeviceId implements Serializable, Comparable<VmDeviceId> {
@@ -46,10 +47,10 @@
@Override
public String toString() {
- StringBuilder sb = new StringBuilder();
- sb.append("deviceId = ").append(getDeviceId());
- sb.append(", vmId = ").append(getVmId());
- return sb.toString();
+ return ToStringBuilder.forInstance(this)
+ .append("deviceId", getDeviceId())
+ .append("vmId", getVmId())
+ .build();
}
public Guid getDeviceId() {
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmGuestAgentInterface.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmGuestAgentInterface.java
index de1b540..89da540 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmGuestAgentInterface.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/VmGuestAgentInterface.java
@@ -3,6 +3,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 VmGuestAgentInterface extends IVdcQueryable {
@@ -107,17 +108,11 @@
@Override
public String toString() {
- StringBuilder builder = new StringBuilder();
- builder.append(getInterfaceName())
- .append(" {vmId=")
- .append(getVmId())
- .append(", macAddress=")
- .append(getMacAddress())
- .append(", ipv4=")
- .append(getIpv4Addresses())
- .append(", ipv6=")
- .append(getIpv6Addresses())
- .append("}");
- return builder.toString();
+ return ToStringBuilder.forInstance(this)
+ .append("vmId", getVmId())
+ .append("macAddress", getMacAddress())
+ .append("ipv4", getIpv4Addresses())
+ .append("ipv6", getIpv6Addresses())
+ .build();
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateVmVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateVmVDSCommandParameters.java
index e770386..d071614 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateVmVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/CreateVmVDSCommandParameters.java
@@ -2,6 +2,7 @@
import org.ovirt.engine.core.common.action.SysPrepParams;
import org.ovirt.engine.core.common.businessentities.VM;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class CreateVmVDSCommandParameters extends VdsAndVmIDVDSParametersBase {
@@ -21,11 +22,6 @@
return vm;
}
- @Override
- public String toString() {
- return String.format("%s, vm=%s", super.toString(), getVm());
- }
-
public SysPrepParams getSysPrepParams() {
return sysPrepParams;
}
@@ -33,4 +29,10 @@
public void setSysPrepParams(SysPrepParams sysPrepParams) {
this.sysPrepParams = sysPrepParams;
}
+
+ @Override
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("vm", getVm());
+ }
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DestroyVmVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DestroyVmVDSCommandParameters.java
index b51cbd0..3c3a069 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DestroyVmVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DestroyVmVDSCommandParameters.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 DestroyVmVDSCommandParameters extends VdsAndVmIDVDSParametersBase
{
@@ -38,12 +39,11 @@
}
@Override
- public String toString() {
- return String.format("%s, force=%s, secondsToWait=%s, gracefully=%s,
reason=%s",
- super.toString(),
- getForce(),
- getSecondsToWait(),
- getGracefully(),
- getReason());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("force", getForce())
+ .append("secondsToWait", getSecondsToWait())
+ .append("gracefully", getGracefully())
+ .append("reason", getReason());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DiscoverSendTargetsVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DiscoverSendTargetsVDSCommandParameters.java
index 99c0ea5..1f097fc 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DiscoverSendTargetsVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/DiscoverSendTargetsVDSCommandParameters.java
@@ -1,6 +1,7 @@
package org.ovirt.engine.core.common.vdscommands;
import org.ovirt.engine.core.common.businessentities.StorageServerConnections;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class DiscoverSendTargetsVDSCommandParameters extends
VdsIdVDSCommandParametersBase {
@@ -23,8 +24,8 @@
}
@Override
- public String toString() {
- return String.format("%s, connection=%s", super.toString(),
getConnection());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("connection", getConnection());
}
-
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetVmsFromExternalProviderParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetVmsFromExternalProviderParameters.java
index 07fda49..94d5063 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetVmsFromExternalProviderParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetVmsFromExternalProviderParameters.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 GetVmsFromExternalProviderParameters extends
VdsIdVDSCommandParametersBase {
@@ -32,7 +33,9 @@
}
@Override
- public String toString() {
- return String.format("%s, url=%s, username=%s", super.toString(), url,
username);
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("url", url)
+ .append("username", username);
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetVmsInfoVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetVmsInfoVDSCommandParameters.java
index c041297..18dde9a 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetVmsInfoVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/GetVmsInfoVDSCommandParameters.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 GetVmsInfoVDSCommandParameters extends
StorageDomainIdParametersBase {
@@ -24,7 +25,8 @@
}
@Override
- public String toString() {
- return String.format("%s, vmIdList = %s", super.toString(),
getVmIdList());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("vmIdList", getVmIdList());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HostDevChangeNumVfsVDSParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HostDevChangeNumVfsVDSParameters.java
index f72fa86..413b52b 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HostDevChangeNumVfsVDSParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/HostDevChangeNumVfsVDSParameters.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 HostDevChangeNumVfsVDSParameters extends
VdsIdVDSCommandParametersBase {
@@ -25,10 +26,9 @@
}
@Override
- public String toString() {
- return String.format("%s, deviceName=%s, numOfVds=%d",
- super.toString(),
- getDeviceName(),
- getNumOfVfs());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("deviceName", getDeviceName())
+ .append("numOfVfs", getNumOfVfs());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/IsVmDuringInitiatingVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/IsVmDuringInitiatingVDSCommandParameters.java
index 75dbd35..7b71f84 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/IsVmDuringInitiatingVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/IsVmDuringInitiatingVDSCommandParameters.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 IsVmDuringInitiatingVDSCommandParameters extends
VDSParametersBase {
@@ -18,7 +19,8 @@
}
@Override
- public String toString() {
- return String.format("vmId = %s", getVmId());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("vmId", getVmId());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MigrateVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MigrateVDSCommandParameters.java
index aa5437f..a4939c1 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MigrateVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/MigrateVDSCommandParameters.java
@@ -1,6 +1,7 @@
package org.ovirt.engine.core.common.vdscommands;
import org.ovirt.engine.core.common.businessentities.MigrationMethod;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.Version;
@@ -81,20 +82,6 @@
migrationMethod = MigrationMethod.OFFLINE;
}
- @Override
- public String toString() {
- return String.format("%s, srcHost=%s, dstVdsId=%s, dstHost=%s,
migrationMethod=%s, tunnelMigration=%s, migrationDowntime=%s, autoConverge=%s,
migrateCompressed=%s",
- super.toString(),
- getSrcHost(),
- getDstVdsId(),
- getDstHost(),
- getMigrationMethod(),
- isTunnelMigration(),
- getMigrationDowntime(),
- getAutoConverge(),
- getMigrateCompressed());
- }
-
public void setClusterVersion(Version clusterVersion) {
this.clusterVersion = clusterVersion;
}
@@ -102,4 +89,17 @@
public Version getClusterVersion() {
return clusterVersion;
}
+
+ @Override
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("srcHost", getSrcHost())
+ .append("dstVdsId", getDstVdsId())
+ .append("dstHost", getDstHost())
+ .append("migrationMethod", getMigrationMethod())
+ .append("tunnelMigration", isTunnelMigration())
+ .append("migrationDowntime", getMigrationDowntime())
+ .append("autoConverge", getAutoConverge())
+ .append("migrateCompressed", getMigrateCompressed());
+ }
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/RemoveVMVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/RemoveVMVDSCommandParameters.java
index 144fe68..648db98 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/RemoveVMVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/RemoveVMVDSCommandParameters.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 RemoveVMVDSCommandParameters extends
StorageDomainIdParametersBase {
@@ -28,7 +29,8 @@
}
@Override
- public String toString() {
- return String.format("%s, vmGuid = %s", super.toString(), getVmGuid());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("vmGuid", getVmGuid());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetVmStatusVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetVmStatusVDSCommandParameters.java
index ee56893..db4cc84 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetVmStatusVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetVmStatusVDSCommandParameters.java
@@ -2,6 +2,7 @@
import org.ovirt.engine.core.common.businessentities.VMStatus;
import org.ovirt.engine.core.common.businessentities.VmExitStatus;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class SetVmStatusVDSCommandParameters extends VDSParametersBase {
@@ -38,8 +39,10 @@
}
@Override
- public String toString() {
- return String.format("vmId = %s, status = %s, exit status = %s",
- getVmId(), getStatus(), getExitStatus());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("vmId", getVmId())
+ .append("status", getStatus())
+ .append("exitStatus", getExitStatus());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetVmTicketVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetVmTicketVDSCommandParameters.java
index df93c60..e66fcde 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetVmTicketVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetVmTicketVDSCommandParameters.java
@@ -1,6 +1,7 @@
package org.ovirt.engine.core.common.vdscommands;
import org.ovirt.engine.core.common.businessentities.GraphicsType;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class SetVmTicketVDSCommandParameters extends
VdsAndVmIDVDSParametersBase {
@@ -45,8 +46,12 @@
}
@Override
- public String toString() {
- return String.format("%s, protocol=%s, ticket=%s, validTime=%s,m
userName=%s, userId=%s", super.toString(),
- graphicsType, getTicket(), getValidTime(), getUserName(),
getUserId());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("protocol", graphicsType)
+ .append("ticket", getTicket())
+ .append("validTime", getValidTime())
+ .append("userName", getUserName())
+ .append("userId", getUserId());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/StartSpiceVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/StartSpiceVDSCommandParameters.java
index 6af86e9..6d3ec33 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/StartSpiceVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/StartSpiceVDSCommandParameters.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 StartSpiceVDSCommandParameters extends
VdsIdVDSCommandParametersBase {
@@ -30,11 +31,10 @@
}
@Override
- public String toString() {
- return String.format("%s, ticket=%s, guestPort=%s, vdsIp=%s",
- super.toString(),
- getTicket(),
- getGuestPort(),
- getVdsIp());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("ticket", getTicket())
+ .append("guestPort", getGuestPort())
+ .append("vdsIp", getVdsIp());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/UpdateVMVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/UpdateVMVDSCommandParameters.java
index 36e5981..5a8c920 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/UpdateVMVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/UpdateVMVDSCommandParameters.java
@@ -4,6 +4,7 @@
import java.util.List;
import java.util.Map;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
import org.ovirt.engine.core.compat.KeyValuePairCompat;
@@ -29,7 +30,8 @@
}
@Override
- public String toString() {
- return String.format("%s, infoDictionary.size = %s", super.toString(),
getInfoDictionary().size());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("infoDictionary.size", getInfoDictionary().size());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/UpdateVmDynamicDataVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/UpdateVmDynamicDataVDSCommandParameters.java
index 552a35a..129ab500a 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/UpdateVmDynamicDataVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/UpdateVmDynamicDataVDSCommandParameters.java
@@ -1,6 +1,7 @@
package org.ovirt.engine.core.common.vdscommands;
import org.ovirt.engine.core.common.businessentities.VmDynamic;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
public class UpdateVmDynamicDataVDSCommandParameters extends
VdsAndVmIDVDSParametersBase{
private VmDynamic privateVmDynamic;
@@ -21,7 +22,8 @@
}
@Override
- public String toString() {
- return String.format("%s, vmDynamic=%s", super.toString(),
getVmDynamic());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("vmDynamic", getVmDynamic());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VmLogoffVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VmLogoffVDSCommandParameters.java
index 90d3dcb..1aa002c 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VmLogoffVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VmLogoffVDSCommandParameters.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 VmLogoffVDSCommandParameters extends VdsAndVmIDVDSParametersBase {
@@ -18,7 +19,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/VmLogonVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VmLogonVDSCommandParameters.java
index 51c0454..6ac9269 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VmLogonVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VmLogonVDSCommandParameters.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 VmLogonVDSCommandParameters extends VdsAndVmIDVDSParametersBase {
@@ -30,11 +31,10 @@
}
@Override
- public String toString() {
- return String.format("%s, domain=%s, password=%s, userName=%s",
- super.toString(),
- getDomain(),
- getPassword() == null ? null : "******",
- getUserName());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("domain", getDomain())
+ .appendFiltered("password", getPassword())
+ .append("userName", getUserName());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VmNicDeviceVDSParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VmNicDeviceVDSParameters.java
index d0565c1..10343e8 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VmNicDeviceVDSParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/VmNicDeviceVDSParameters.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.network.VmNic;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class VmNicDeviceVDSParameters extends VdsIdVDSCommandParametersBase {
@@ -34,11 +35,10 @@
}
@Override
- public String toString() {
- return String.format("%s, vm.vm_name=%s, nic=%s, vmDevice=%s",
- super.toString(),
- (getVm() == null ? "" : getVm().getName()),
- getNic(),
- getVmDevice());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("vm.vm_name", getVm() == null ? "" : getVm().getName())
+ .append("nic", getNic())
+ .append("vmDevice", getVmDevice());
}
}
--
To view, visit https://gerrit.ovirt.org/39979
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I613b765acfdde6be3645febc600947ffca9cb358
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
