Martin Peřina has uploaded a new change for review.
Change subject: core: Use ToStringBuilder in network classes
......................................................................
core: Use ToStringBuilder in network classes
Refactor existing toString() methods to use ToStringBuilder in network
classes.
Change-Id: I1919a8ef62cac9ed5f9d68306de29588e86ae6e0
Signed-off-by: Martin Perina <mper...@redhat.com>
---
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/OpenstackNetworkProviderProperties.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/Bond.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/ExternalSubnet.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/HostNetworkQos.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/HostNicVfsConfig.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/Network.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/NetworkCluster.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/NetworkClusterId.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/Nic.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/ProviderNetwork.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VdsNetworkInterface.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/Vlan.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VmNetworkInterface.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VmNic.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VnicProfile.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/NetworkVdsmVDSCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetupNetworksVdsCommandParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ValidateStorageDomainVDSCommandParameters.java
18 files changed, 180 insertions(+), 292 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/82/39982/1
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/OpenstackNetworkProviderProperties.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/OpenstackNetworkProviderProperties.java
index ff11e8d..db33bde 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/OpenstackNetworkProviderProperties.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/OpenstackNetworkProviderProperties.java
@@ -2,6 +2,8 @@
import java.io.Serializable;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
+
public class OpenstackNetworkProviderProperties extends
TenantProviderProperties {
private static final long serialVersionUID = -7470940167999871534L;
@@ -79,14 +81,9 @@
}
@Override
- public String toString() {
- StringBuilder builder = new StringBuilder();
- builder.append("OpenstackNetworkProviderProperties [pluginType=")
- .append(getPluginType())
- .append(", tenantName=")
- .append(getTenantName())
- .append("]");
- return builder.toString();
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("pluginType", getPluginType());
}
public static class MessagingConfiguration implements Serializable {
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/Bond.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/Bond.java
index 2ea3a9a..f7acc46 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/Bond.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/Bond.java
@@ -1,10 +1,9 @@
package org.ovirt.engine.core.common.businessentities.network;
-import java.util.Map;
-
import javax.validation.constraints.Pattern;
import
org.ovirt.engine.core.common.businessentities.BusinessEntitiesDefinitions;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
public class Bond extends VdsNetworkInterface {
@@ -33,11 +32,10 @@
}
@Override
- protected Map<String, Object> constructStringAttributes() {
- Map<String, Object> attributes = super.constructStringAttributes();
- attributes.put("macAddress", getMacAddress());
- attributes.put("bondOptions", getBondOptions());
- attributes.put("labels", getLabels());
- return attributes;
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("macAddress", getMacAddress())
+ .append("bondOptions", getBondOptions())
+ .append("labels", getLabels());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/ExternalSubnet.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/ExternalSubnet.java
index 1a29a2c..0a108c1 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/ExternalSubnet.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/ExternalSubnet.java
@@ -7,6 +7,7 @@
import org.ovirt.engine.core.common.businessentities.IVdcQueryable;
import org.ovirt.engine.core.common.businessentities.Nameable;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.common.validation.annotation.Cidr;
import org.ovirt.engine.core.common.validation.group.CreateEntity;
import org.ovirt.engine.core.common.validation.group.RemoveEntity;
@@ -96,23 +97,15 @@
@Override
public String toString() {
- StringBuilder builder = new StringBuilder();
- builder.append("Subnet [id=")
- .append(getId())
- .append(", name=")
- .append(getName())
- .append(", cidr=")
- .append(getCidr())
- .append(", ipVersion=")
- .append(getIpVersion())
- .append(", externalNetwork=")
- .append(getExternalNetwork())
- .append(", gateway=")
- .append(getGateway())
- .append(", dnsServers=")
- .append(getDnsServers())
- .append("]");
- return builder.toString();
+ return ToStringBuilder.forInstance(this)
+ .append("id", getId())
+ .append("name", getName())
+ .append("cidr", getCidr())
+ .append("ipVersion", getIpVersion())
+ .append("externalNetwork", getExternalNetwork())
+ .append("gateway", getGateway())
+ .append("dnsServers", getDnsServers())
+ .build();
}
@Override
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/HostNetworkQos.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/HostNetworkQos.java
index 2347d89..e030302 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/HostNetworkQos.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/HostNetworkQos.java
@@ -4,6 +4,7 @@
import org.ovirt.engine.core.common.businessentities.qos.QosType;
import org.ovirt.engine.core.common.config.ConfigValues;
import org.ovirt.engine.core.common.utils.ObjectUtils;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.common.validation.annotation.ConfiguredRange;
public class HostNetworkQos extends QosBase {
@@ -52,15 +53,11 @@
@Override
public String toString() {
- StringBuilder builder = new StringBuilder();
- builder.append("[outAverageLinkshare=")
- .append(renderQosParameter(outAverageLinkshare))
- .append(", outAverageUpperlimit=")
- .append(renderQosParameter(outAverageUpperlimit))
- .append(", outAverageRealtime=")
- .append(renderQosParameter(outAverageRealtime))
- .append("]");
- return builder.toString();
+ return ToStringBuilder.forInstance(this)
+ .append("outAverageLinkshare",
renderQosParameter(outAverageLinkshare))
+ .append("outAverageUpperlimit",
renderQosParameter(outAverageUpperlimit))
+ .append("outAverageRealtime",
renderQosParameter(outAverageRealtime))
+ .build();
}
@Override
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/HostNicVfsConfig.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/HostNicVfsConfig.java
index 3c62167..e4c1c34 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/HostNicVfsConfig.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/HostNicVfsConfig.java
@@ -7,6 +7,7 @@
import org.ovirt.engine.core.common.businessentities.BusinessEntity;
import org.ovirt.engine.core.common.businessentities.IVdcQueryable;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class HostNicVfsConfig extends IVdcQueryable implements Serializable,
BusinessEntity<Guid> {
@@ -120,23 +121,15 @@
@Override
public String toString() {
- StringBuilder builder = new StringBuilder();
- builder.append(" {id=")
- .append(getId())
- .append(" {nicId=")
- .append(getNicId())
- .append(" {allNetworksAllowed=")
- .append(isAllNetworksAllowed())
- .append(" {maxNumOfVfs=")
- .append(getMaxNumOfVfs())
- .append(" {numOfVfs=")
- .append(getNumOfVfs())
- .append(" {networks=")
- .append(getNetworks())
- .append(" {networkLabels=")
- .append(getNetworkLabels())
- .append("}");
- return builder.toString();
+ return ToStringBuilder.forInstance(this)
+ .append("id", getId())
+ .append("nicId", getNicId())
+ .append("allNetworksAllowed", isAllNetworksAllowed())
+ .append("maxNumOfVfs", getMaxNumOfVfs())
+ .append("numOfVfs", getNumOfVfs())
+ .append("networks", getNetworks())
+ .append("networkLabels", getNetworkLabels())
+ .build();
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/Network.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/Network.java
index b4307a9..83a74e4 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/Network.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/Network.java
@@ -14,6 +14,7 @@
import org.ovirt.engine.core.common.businessentities.IVdcQueryable;
import org.ovirt.engine.core.common.businessentities.Nameable;
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.MTU;
import org.ovirt.engine.core.common.validation.annotation.ValidName;
@@ -219,40 +220,23 @@
@Override
public String toString() {
- StringBuilder builder = new StringBuilder();
- builder.append(getName())
- .append(" {id=")
- .append(getId())
- .append(", description=")
- .append(getDescription())
- .append(", comment=")
- .append(getComment())
- .append(", subnet=")
- .append(getSubnet())
- .append(", gateway=")
- .append(getGateway())
- .append(", type=")
- .append(getType())
- .append(", vlanId=")
- .append(getVlanId())
- .append(", stp=")
- .append(getStp())
- .append(", dataCenterId=")
- .append(getDataCenterId())
- .append(", mtu=")
- .append(getMtu())
- .append(", vmNetwork=")
- .append(isVmNetwork())
- .append(", cluster=")
- .append(getCluster())
- .append(", providedBy=")
- .append(getProvidedBy())
- .append(", label=")
- .append(getLabel())
- .append(", qosId=")
- .append(getQosId())
- .append("}");
- return builder.toString();
+ return ToStringBuilder.forInstance(this)
+ .append("id", getId())
+ .append("description", getDescription())
+ .append("comment", getComment())
+ .append("subnet", getSubnet())
+ .append("gateway", getGateway())
+ .append("type", getType())
+ .append("vlanId", getVlanId())
+ .append("stp", getStp())
+ .append("dataCenterId", getDataCenterId())
+ .append("mtu", getMtu())
+ .append("vmNetwork", isVmNetwork())
+ .append("cluster", getCluster())
+ .append("providedBy", getProvidedBy())
+ .append("label", getLabel())
+ .append("qosId", getQosId())
+ .build();
}
@Override
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/NetworkCluster.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/NetworkCluster.java
index dda6708..98c3b41 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/NetworkCluster.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/NetworkCluster.java
@@ -2,6 +2,7 @@
import org.ovirt.engine.core.common.businessentities.BusinessEntityWithStatus;
import org.ovirt.engine.core.common.businessentities.IVdcQueryable;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class NetworkCluster extends IVdcQueryable implements
BusinessEntityWithStatus<NetworkClusterId, NetworkStatus> {
@@ -130,23 +131,15 @@
@Override
public String toString() {
- StringBuilder builder = new StringBuilder();
- builder.append("NetworkCluster {id=")
- .append(getId())
- .append(", status=")
- .append(getStatus())
- .append(", display=")
- .append(isDisplay())
- .append(", required=")
- .append(isRequired())
- .append(", migration=")
- .append(isMigration())
- .append(", management=")
- .append(isManagement())
- .append(", gluster=")
- .append(isGluster())
- .append("}");
- return builder.toString();
+ return ToStringBuilder.forInstance(this)
+ .append("id", getId())
+ .append("status", getStatus())
+ .append("display", isDisplay())
+ .append("required", isRequired())
+ .append("migration", isMigration())
+ .append("management", isManagement())
+ .append("gluster", isGluster())
+ .build();
}
@Override
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/NetworkClusterId.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/NetworkClusterId.java
index 52ad920..1750911 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/NetworkClusterId.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/NetworkClusterId.java
@@ -2,6 +2,7 @@
import java.io.Serializable;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class NetworkClusterId implements Serializable {
@@ -76,12 +77,9 @@
@Override
public String toString() {
- StringBuilder builder = new StringBuilder();
- builder.append("{clusterId=")
- .append(getClusterId())
- .append(", networkId=")
- .append(getNetworkId())
- .append("}");
- return builder.toString();
+ return ToStringBuilder.forInstance(this)
+ .append("clusterId", getClusterId())
+ .append("networkId", getNetworkId())
+ .build();
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/Nic.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/Nic.java
index 8767f3c..5d2f8a5 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/Nic.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/Nic.java
@@ -1,6 +1,6 @@
package org.ovirt.engine.core.common.businessentities.network;
-import java.util.Map;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
public class Nic extends VdsNetworkInterface {
@@ -17,12 +17,11 @@
}
@Override
- protected Map<String, Object> constructStringAttributes() {
- Map<String, Object> attributes = super.constructStringAttributes();
- attributes.put("macAddress", getMacAddress());
- attributes.put("bondName", getBondName());
- attributes.put("speed", getSpeed());
- attributes.put("labels", getLabels());
- return attributes;
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("macAddress", getMacAddress())
+ .append("bondName", getBondName())
+ .append("speed", getSpeed())
+ .append("labels", getLabels());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/ProviderNetwork.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/ProviderNetwork.java
index 132d53b..128d40d 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/ProviderNetwork.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/ProviderNetwork.java
@@ -2,6 +2,7 @@
import java.io.Serializable;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class ProviderNetwork implements Serializable {
@@ -69,12 +70,9 @@
@Override
public String toString() {
- StringBuilder builder = new StringBuilder();
- builder.append("ProviderNetwork [providerId=")
- .append(getProviderId())
- .append(", externalId=")
- .append(getExternalId())
- .append("]");
- return builder.toString();
+ return ToStringBuilder.forInstance(this)
+ .append("providerId", getProviderId())
+ .append("externalId", getExternalId())
+ .build();
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VdsNetworkInterface.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VdsNetworkInterface.java
index 822e515..c614eb6 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VdsNetworkInterface.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VdsNetworkInterface.java
@@ -1,18 +1,15 @@
package org.ovirt.engine.core.common.businessentities.network;
import java.io.Serializable;
-import java.util.Iterator;
-import java.util.LinkedHashMap;
import java.util.Map;
-import java.util.Map.Entry;
import java.util.Set;
-
import javax.validation.constraints.NotNull;
import javax.validation.constraints.Pattern;
import javax.validation.constraints.Size;
import
org.ovirt.engine.core.common.businessentities.BusinessEntitiesDefinitions;
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.Mask;
import
org.ovirt.engine.core.common.validation.annotation.ValidNetworkConfiguration;
@@ -430,46 +427,26 @@
setCustomProperties(sourceNic.getCustomProperties());
}
- protected Map<String, Object> constructStringAttributes() {
- Map<String, Object> attributes = new LinkedHashMap<>();
- attributes.put("id", getId());
- attributes.put("vdsId", getVdsId());
- attributes.put("networkName", getNetworkName());
- attributes.put("bootProtocol", getBootProtocol());
- attributes.put("address", getAddress());
- attributes.put("subnet", getSubnet());
- attributes.put("gateway", getGateway());
- attributes.put("mtu", getMtu());
- attributes.put("bridged", isBridged());
- attributes.put("type", getType());
- attributes.put("networkImplementationDetails",
getNetworkImplementationDetails());
- attributes.put("qos", getQos());
- attributes.put("qosOverridden", isQosOverridden());
- attributes.put("customProperties", getCustomProperties());
- return attributes;
- }
-
- private static void appendEntry(StringBuilder builder, Entry<String,
Object> entry) {
- builder.append(entry.getKey()).append('=').append(entry.getValue());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return tsb.append("id", getId())
+ .append("vdsId", getVdsId())
+ .append("networkName", getNetworkName())
+ .append("bootProtocol", getBootProtocol())
+ .append("address", getAddress())
+ .append("subnet", getSubnet())
+ .append("gateway", getGateway())
+ .append("mtu", getMtu())
+ .append("bridged", isBridged())
+ .append("type", getType())
+ .append("networkImplementationDetails",
getNetworkImplementationDetails())
+ .append("qos", getQos())
+ .append("qosOverridden", isQosOverridden())
+ .append("customProperties", getCustomProperties());
}
@Override
public String toString() {
- StringBuilder builder = new StringBuilder();
- builder.append(getName()).append(" {");
-
- Map<String, Object> attributes = constructStringAttributes();
- if (attributes != null && !attributes.isEmpty()) {
- Iterator<Entry<String, Object>> i =
attributes.entrySet().iterator();
- appendEntry(builder, i.next());
- while (i.hasNext()) {
- builder.append(", ");
- appendEntry(builder, i.next());
- }
- }
-
- builder.append("}");
- return builder.toString();
+ return appendAttributes(ToStringBuilder.forInstance(this)).build();
}
@Override
@@ -641,13 +618,10 @@
@Override
public String toString() {
- StringBuilder builder = new StringBuilder();
- builder.append("{inSync=")
- .append(isInSync())
- .append(", managed=")
- .append(isManaged())
- .append("}");
- return builder.toString();
+ return ToStringBuilder.forInstance(this)
+ .append("inSync", isInSync())
+ .append("managed", isManaged())
+ .build();
}
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/Vlan.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/Vlan.java
index 244e234..77b8943 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/Vlan.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/Vlan.java
@@ -1,6 +1,6 @@
package org.ovirt.engine.core.common.businessentities.network;
-import java.util.Map;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
public class Vlan extends VdsNetworkInterface {
@@ -17,10 +17,9 @@
}
@Override
- protected Map<String, Object> constructStringAttributes() {
- Map<String, Object> attributes = super.constructStringAttributes();
- attributes.put("baseInterface", getBaseInterface());
- attributes.put("vlanId", getVlanId());
- return attributes;
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("baseInterface", getBaseInterface())
+ .append("vlanId", getVlanId());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VmNetworkInterface.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VmNetworkInterface.java
index 21abd8c..f173796 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VmNetworkInterface.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VmNetworkInterface.java
@@ -1,6 +1,7 @@
package org.ovirt.engine.core.common.businessentities.network;
import org.ovirt.engine.core.common.utils.ObjectUtils;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
/**
* <code>VmNetworkInterface</code> defines a type of {@link VmNic} for
instances of {@link VM}.
@@ -96,38 +97,22 @@
@Override
public String toString() {
- StringBuilder builder = new StringBuilder();
- builder.append(getName())
- .append(" {id=")
- .append(getId())
- .append(", networkName=")
- .append(getNetworkName())
- .append(", vnicProfileName=")
- .append(getVnicProfileName())
- .append(", vnicProfileId=")
- .append(getVnicProfileId())
- .append(", speed=")
- .append(getSpeed())
- .append(", type=")
- .append(getType())
- .append(", macAddress=")
- .append(getMacAddress())
- .append(", active=")
- .append(isPlugged())
- .append(", linked=")
- .append(isLinked())
- .append(", portMirroring=")
- .append(isPortMirroring())
- .append(", vmId=")
- .append(getVmId())
- .append(", vmName=")
- .append(getVmName())
- .append(", vmTemplateId=")
- .append(getVmTemplateId())
- .append(", QoSName=")
- .append(getQosName())
- .append("}");
- return builder.toString();
+ return ToStringBuilder.forInstance(this)
+ .append("id", getId())
+ .append("networkName", getNetworkName())
+ .append("vnicProfileName", getVnicProfileName())
+ .append("vnicProfileId", getVnicProfileId())
+ .append("speed", getSpeed())
+ .append("type", getType())
+ .append("macAddress", getMacAddress())
+ .append("active", isPlugged())
+ .append("linked", isLinked())
+ .append("portMirroring", isPortMirroring())
+ .append("vmId", getVmId())
+ .append("vmName", getVmName())
+ .append("vmTemplateId", getVmTemplateId())
+ .append("QoSName", getQosName())
+ .build();
}
@Override
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VmNic.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VmNic.java
index 1293e25..a1476f6 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VmNic.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VmNic.java
@@ -5,6 +5,7 @@
import org.ovirt.engine.core.common.utils.MacAddressValidationPatterns;
import org.ovirt.engine.core.common.utils.ObjectUtils;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.common.validation.annotation.ValidNameWithDot;
import org.ovirt.engine.core.common.validation.group.CreateEntity;
import org.ovirt.engine.core.common.validation.group.UpdateEntity;
@@ -108,26 +109,16 @@
@Override
public String toString() {
- StringBuilder builder = new StringBuilder();
- builder.append(getName())
- .append(" {id=")
- .append(getId())
- .append(", vnicProfileId=")
- .append(getVnicProfileId())
- .append(", speed=")
- .append(getSpeed())
- .append(", type=")
- .append(getType())
- .append(", macAddress=")
- .append(getMacAddress())
- .append(", linked=")
- .append(isLinked())
- .append(", vmId=")
- .append(getVmId())
- .append(", vmTemplateId=")
- .append(getVmTemplateId())
- .append("}");
- return builder.toString();
+ return ToStringBuilder.forInstance(this)
+ .append("id", getId())
+ .append("vnicProfileId", getVnicProfileId())
+ .append("speed", getSpeed())
+ .append("type", getType())
+ .append("macAddress", getMacAddress())
+ .append("linked", isLinked())
+ .append("vmId", getVmId())
+ .append("vmTemplateId", getVmTemplateId())
+ .build();
}
@Override
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VnicProfile.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VnicProfile.java
index af5bd43..f3dd056 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VnicProfile.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/network/VnicProfile.java
@@ -10,6 +10,7 @@
import org.ovirt.engine.core.common.businessentities.IVdcQueryable;
import org.ovirt.engine.core.common.businessentities.Nameable;
import org.ovirt.engine.core.common.utils.ObjectUtils;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.common.validation.annotation.ValidName;
import org.ovirt.engine.core.common.validation.group.CreateEntity;
import org.ovirt.engine.core.common.validation.group.RemoveEntity;
@@ -161,23 +162,14 @@
@Override
public String toString() {
- StringBuilder builder = new StringBuilder();
- builder.append(getName())
- .append(" {id=")
- .append(getId())
- .append(", networkId=")
- .append(getNetworkId())
- .append(", networkQosId=")
- .append(getNetworkQosId())
- .append(", portMirroring=")
- .append(isPortMirroring())
- .append(", passthrough=")
- .append(isPassthrough())
- .append(", customProperties=")
- .append(getCustomProperties())
- .append(", description=")
- .append(getDescription())
- .append("}");
- return builder.toString();
+ return ToStringBuilder.forInstance(this)
+ .append("id", getId())
+ .append("networkId", getNetworkId())
+ .append("networkQosId", getNetworkQosId())
+ .append("portMirroring", isPortMirroring())
+ .append("passthrough", isPassthrough())
+ .append("customProperties", getCustomProperties())
+ .append("description", getDescription())
+ .build();
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/NetworkVdsmVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/NetworkVdsmVDSCommandParameters.java
index b1ded83..78ec4f1 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/NetworkVdsmVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/NetworkVdsmVDSCommandParameters.java
@@ -1,9 +1,8 @@
package org.ovirt.engine.core.common.vdscommands;
-import java.util.Arrays;
-
import org.ovirt.engine.core.common.businessentities.network.Network;
import
org.ovirt.engine.core.common.businessentities.network.NetworkBootProtocol;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class NetworkVdsmVDSCommandParameters extends
VdsIdVDSCommandParametersBase {
@@ -207,26 +206,23 @@
}
@Override
- public String toString() {
- return String.format("%s, networkName=%s, oldNetworkName=%s,
hostAddr=%s, checkConnectivity=%s, "
- + "connectionTimeout=%s, vlanId=%s, bondName=%s, nics=%s,
inetAddr=%s, networkMask=%s, gateway=%s, "
- + "stp=%s, bondingOptions=%s, bootProtocol=%s, vmNetwork=%s,
network=%s",
- super.toString(),
- getNetworkName(),
- getOldNetworkName(),
- getHostAddr(),
- getCheckConnectivity(),
- getConnectionTimeout(),
- getVlanId(),
- getBondName(),
- Arrays.toString(getNics()),
- getInetAddr(),
- getNetworkMask(),
- getGateway(),
- getStp(),
- getBondingOptions(),
- getBootProtocol(),
- isVmNetwork(),
- getNetwork());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("networkName", getNetworkName())
+ .append("oldNetworkName", getOldNetworkName())
+ .append("hostAddr", getHostAddr())
+ .append("checkConnectivity", getCheckConnectivity())
+ .append("connectionTimeout", getConnectionTimeout())
+ .append("vlanId", getVlanId())
+ .append("bondName", getBondName())
+ .append("nics", getNics())
+ .append("inetAddr", getInetAddr())
+ .append("networkMask", getNetworkMask())
+ .append("gateway", getGateway())
+ .append("stp", getStp())
+ .append("bondingOptions", getBondingOptions())
+ .append("bootProtocol", getBootProtocol())
+ .append("vmNetwork", isVmNetwork())
+ .append("network", getNetwork());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetupNetworksVdsCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetupNetworksVdsCommandParameters.java
index c185aac..e46d404 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetupNetworksVdsCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/SetupNetworksVdsCommandParameters.java
@@ -5,10 +5,10 @@
import java.util.List;
import java.util.Set;
-import org.ovirt.engine.core.common.businessentities.Entities;
import org.ovirt.engine.core.common.businessentities.VDS;
import org.ovirt.engine.core.common.businessentities.network.Network;
import
org.ovirt.engine.core.common.businessentities.network.VdsNetworkInterface;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
public class SetupNetworksVdsCommandParameters extends
VdsIdVDSCommandParametersBase {
private VDS vds;
@@ -123,16 +123,15 @@
}
@Override
- public String toString() {
- return String.format("%s, force=%s, checkConnectivity=%s,
conectivityTimeout=%s,%n\tnetworks=%s,%n\tbonds=%s,%n\tinterfaces=%s,%n\tremovedNetworks=%s,%n\tremovedBonds=%s",
- super.toString(),
- isForce(),
- isCheckConnectivity(),
- getConectivityTimeout(),
- Entities.collectionToString(getNetworks(), "\t\t"),
- Entities.collectionToString(getBonds(), "\t\t"),
- Entities.collectionToString(getInterfaces(), "\t\t"),
- getRemovedNetworks(),
- getRemovedBonds());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("force", isForce())
+ .append("checkConnectivity", isCheckConnectivity())
+ .append("connectivityTimeout", getConectivityTimeout())
+ .append("networks", getNetworks())
+ .append("bonds", getBonds())
+ .append("interfaces", getInterfaces())
+ .append("removedNetworks", getRemovedNetworks())
+ .append("removedBonds", getRemovedBonds());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ValidateStorageDomainVDSCommandParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ValidateStorageDomainVDSCommandParameters.java
index 5722333..8173043 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ValidateStorageDomainVDSCommandParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/ValidateStorageDomainVDSCommandParameters.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 ValidateStorageDomainVDSCommandParameters extends
VdsIdVDSCommandParametersBase {
@@ -23,7 +24,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());
}
}
--
To view, visit https://gerrit.ovirt.org/39982
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I1919a8ef62cac9ed5f9d68306de29588e86ae6e0
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
