Martin Peřina has uploaded a new change for review.
Change subject: core: Use ToStringBuilder in gluster classes
......................................................................
core: Use ToStringBuilder in gluster classes
Refactor existing toString() methods to use ToStringBuilder in gluster
classes.
Change-Id: I16e44629e49616da481a387cd89dad3549d2c22e
Signed-off-by: Martin Perina <mper...@redhat.com>
---
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/asynctasks/gluster/GlusterAsyncTask.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeSnapshotConfig.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/CreateBrickVDSParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/CreateGlusterVolumeSnapshotVDSParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeActivateSnapshotVDSParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeSnapshotActionVDSParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeSnapshotSetConfigVDSParameters.java
M
backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeVDSParameters.java
8 files changed, 48 insertions(+), 35 deletions(-)
git pull ssh://gerrit.ovirt.org:29418/ovirt-engine refs/changes/80/39980/1
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/asynctasks/gluster/GlusterAsyncTask.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/asynctasks/gluster/GlusterAsyncTask.java
index bc55b1b..77f152d 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/asynctasks/gluster/GlusterAsyncTask.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/asynctasks/gluster/GlusterAsyncTask.java
@@ -4,6 +4,7 @@
import org.ovirt.engine.core.common.job.JobExecutionStatus;
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 GlusterAsyncTask implements Serializable{
@@ -117,7 +118,11 @@
@Override
public String toString() {
- return "GlusterAsyncTask[" + getTaskId() + "-" + getType() + "-" +
getStatus() + "]";
+ return ToStringBuilder.forInstance(this)
+ .append("taskId", getTaskId())
+ .append("type", getType())
+ .append("status", getStatus())
+ .build();
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeSnapshotConfig.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeSnapshotConfig.java
index 3bf665a..a2f4757 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeSnapshotConfig.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/businessentities/gluster/GlusterVolumeSnapshotConfig.java
@@ -2,6 +2,7 @@
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;
public class GlusterVolumeSnapshotConfig extends IVdcQueryable {
@@ -93,16 +94,11 @@
@Override
public String toString() {
- StringBuilder sb = new StringBuilder("GlusterVolumeSnapshotConfig {");
- sb.append("clusterId=");
- sb.append(getClusterId());
- sb.append(", volumeId=");
- sb.append(getVolumeId());
- sb.append(", paramName=");
- sb.append(getParamName());
- sb.append(", paramValue=");
- sb.append(getParamValue());
- sb.append("}");
- return sb.toString();
+ return ToStringBuilder.forInstance(this)
+ .append("clusterId", getClusterId())
+ .append("volumeId", getVolumeId())
+ .append("paramName", getParamName())
+ .append("paramValue", getParamValue())
+ .build();
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/CreateBrickVDSParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/CreateBrickVDSParameters.java
index 25073b4..8df44ee 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/CreateBrickVDSParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/CreateBrickVDSParameters.java
@@ -4,6 +4,7 @@
import java.util.Map;
import org.ovirt.engine.core.common.businessentities.gluster.StorageDevice;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.common.vdscommands.VdsIdVDSCommandParametersBase;
import org.ovirt.engine.core.compat.Guid;
@@ -68,17 +69,6 @@
this.mountPoint = mountPoint;
}
- @Override
- public String toString() {
- return String.format("CreateBrickVDSParameters %s, lvName=%s,
mountPoint=%s, storageDevices=%s, raidParams=%s, fsType=%s, ",
- super.toString(),
- lvName,
- mountPoint,
- storageDevices,
- raidParams,
- fsType);
- }
-
public String getFsType() {
return fsType;
}
@@ -87,4 +77,13 @@
this.fsType = fsType;
}
+ @Override
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("lvName", lvName)
+ .append("mountPoint", mountPoint)
+ .append("storageDevices", storageDevices)
+ .append("raidParams", raidParams)
+ .append("fsType", fsType);
+ }
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/CreateGlusterVolumeSnapshotVDSParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/CreateGlusterVolumeSnapshotVDSParameters.java
index ece7b66..be7d449 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/CreateGlusterVolumeSnapshotVDSParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/CreateGlusterVolumeSnapshotVDSParameters.java
@@ -1,5 +1,6 @@
package org.ovirt.engine.core.common.vdscommands.gluster;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class CreateGlusterVolumeSnapshotVDSParameters extends
GlusterVolumeVDSParameters {
@@ -46,11 +47,10 @@
}
@Override
- public String toString() {
- return String.format("%s, snapshotName=%s, description=%s, force=%s",
- super.toString(),
- getSnapshotName(),
- getDescription(),
- getForce());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("snapshotName", getSnapshotName())
+ .append("description", getDescription())
+ .append("force", getForce());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeActivateSnapshotVDSParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeActivateSnapshotVDSParameters.java
index f5e14ce..2f8ebb1 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeActivateSnapshotVDSParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeActivateSnapshotVDSParameters.java
@@ -1,5 +1,6 @@
package org.ovirt.engine.core.common.vdscommands.gluster;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class GlusterVolumeActivateSnapshotVDSParameters extends
GlusterVolumeSnapshotActionVDSParameters {
@@ -25,7 +26,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/gluster/GlusterVolumeSnapshotActionVDSParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeSnapshotActionVDSParameters.java
index 3fe4fe4..5056d5e 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeSnapshotActionVDSParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeSnapshotActionVDSParameters.java
@@ -1,5 +1,6 @@
package org.ovirt.engine.core.common.vdscommands.gluster;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.compat.Guid;
public class GlusterVolumeSnapshotActionVDSParameters extends
GlusterVolumeVDSParameters {
@@ -22,7 +23,8 @@
}
@Override
- public String toString() {
- return String.format("%s, snapshotName=%s", super.toString(),
getSnapshotName());
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("snapshotName", getSnapshotName());
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeSnapshotSetConfigVDSParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeSnapshotSetConfigVDSParameters.java
index d7408da..4fb077a 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeSnapshotSetConfigVDSParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeSnapshotSetConfigVDSParameters.java
@@ -1,6 +1,7 @@
package org.ovirt.engine.core.common.vdscommands.gluster;
import
org.ovirt.engine.core.common.businessentities.gluster.GlusterVolumeSnapshotConfig;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.common.vdscommands.VdsIdVDSCommandParametersBase;
import org.ovirt.engine.core.compat.Guid;
@@ -20,7 +21,8 @@
}
@Override
- public String toString() {
- return String.format("%s, configParam=%s", super.toString(),
configParam);
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("configParam", configParam);
}
}
diff --git
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeVDSParameters.java
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeVDSParameters.java
index f321ebf..0562d93 100644
---
a/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeVDSParameters.java
+++
b/backend/manager/modules/common/src/main/java/org/ovirt/engine/core/common/vdscommands/gluster/GlusterVolumeVDSParameters.java
@@ -1,5 +1,6 @@
package org.ovirt.engine.core.common.vdscommands.gluster;
+import org.ovirt.engine.core.common.utils.ToStringBuilder;
import org.ovirt.engine.core.common.vdscommands.VdsIdVDSCommandParametersBase;
import org.ovirt.engine.core.compat.Guid;
@@ -22,4 +23,10 @@
public String getVolumeName() {
return volumeName;
}
+
+ @Override
+ protected ToStringBuilder appendAttributes(ToStringBuilder tsb) {
+ return super.appendAttributes(tsb)
+ .append("volumeName", volumeName);
+ }
}
--
To view, visit https://gerrit.ovirt.org/39980
To unsubscribe, visit https://gerrit.ovirt.org/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I16e44629e49616da481a387cd89dad3549d2c22e
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
