Skip to content

Commit 163ced4

Browse files
Locharla, SandeepLocharla, Sandeep
Locharla, Sandeep
authored and
Locharla, Sandeep
committed
Addressed comments to use ReflectionToStringBuilderUtils in toString methods for models
1 parent 1dbfdf6 commit 163ced4

File tree

13 files changed

+29
-179
lines changed

13 files changed

+29
-179
lines changed

‎plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/Aggregate.java‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import com.fasterxml.jackson.annotation.JsonProperty;
2525
import com.fasterxml.jackson.annotation.JsonCreator;
2626
import com.fasterxml.jackson.annotation.JsonValue;
27+
import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
2728

2829
import java.util.Objects;
2930

@@ -132,20 +133,9 @@ public boolean equals(java.lang.Object o) {
132133
Objects.equals(this.uuid, diskAggregates.uuid);
133134
}
134135

135-
/**
136-
* Convert the given object to string with each line indented by 4 spaces
137-
* (except the first line).
138-
*/
139-
private String toIndentedString(java.lang.Object o) {
140-
if (o == null) {
141-
return "null";
142-
}
143-
return o.toString().replace("\n", "\n ");
144-
}
145-
146136
@Override
147137
public String toString() {
148-
return "DiskAggregates [name=" + name + ", uuid=" + uuid + "]";
138+
return ReflectionToStringBuilderUtils.reflectOnlySelectedFields(this, "name", "uuid", "state", "space");
149139
}
150140

151141
public static class AggregateSpace {

‎plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/Cluster.java‎

Lines changed: 2 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
2323
import com.fasterxml.jackson.annotation.JsonInclude;
2424
import com.fasterxml.jackson.annotation.JsonProperty;
25+
import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
2526

2627
import java.util.Objects;
2728

@@ -123,12 +124,6 @@ public boolean equals(java.lang.Object o) {
123124
}
124125
@Override
125126
public String toString() {
126-
return "Cluster{" +
127-
"name='" + name + '\'' +
128-
", uuid='" + uuid + '\'' +
129-
", version=" + version +
130-
", sanOptimized=" + sanOptimized +
131-
", disaggregated=" + disaggregated +
132-
'}';
127+
return ReflectionToStringBuilderUtils.reflectOnlySelectedFields(this, "name", "uuid", "version", "sanOptimized", "disaggregated");
133128
}
134129
}

‎plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/ExportPolicy.java‎

Lines changed: 2 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
2323
import com.fasterxml.jackson.annotation.JsonInclude;
2424
import com.fasterxml.jackson.annotation.JsonProperty;
25+
import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
2526
import java.math.BigInteger;
2627
import java.util.List;
2728
import java.util.Objects;
@@ -104,19 +105,6 @@ public int hashCode() {
104105

105106
@Override
106107
public String toString() {
107-
StringBuilder sb = new StringBuilder();
108-
sb.append("class ExportPolicy {\n");
109-
sb.append(" id: ").append(toIndentedString(id)).append("\n");
110-
sb.append(" name: ").append(toIndentedString(name)).append("\n");
111-
sb.append(" rules: ").append(toIndentedString(rules)).append("\n");
112-
sb.append(" svm: ").append(toIndentedString(svm)).append("\n");
113-
sb.append("}");
114-
return sb.toString();
115-
}
116-
private String toIndentedString(Object o) {
117-
if (o == null) {
118-
return "null";
119-
}
120-
return o.toString().replace("\n", "\n ");
108+
return ReflectionToStringBuilderUtils.reflectOnlySelectedFields(this, "id", "name", "rules", "svm");
121109
}
122110
}

‎plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/ExportRule.java‎

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
2323
import com.fasterxml.jackson.annotation.JsonInclude;
2424
import com.fasterxml.jackson.annotation.JsonProperty;
25+
import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
2526
import java.util.List;
2627

2728
/**
@@ -176,20 +177,6 @@ public void setSuperuser(List<String> superuser) {
176177

177178
@Override
178179
public String toString() {
179-
StringBuilder sb = new StringBuilder();
180-
sb.append("class ExportRule {\n");
181-
182-
sb.append(" anonymousUser: ").append(toIndentedString(anonymousUser)).append("\n");
183-
sb.append(" clients: ").append(toIndentedString(clients)).append("\n");
184-
sb.append(" index: ").append(toIndentedString(index)).append("\n");
185-
sb.append(" protocols: ").append(toIndentedString(protocols)).append("\n");
186-
sb.append("}");
187-
return sb.toString();
188-
}
189-
private String toIndentedString(Object o) {
190-
if (o == null) {
191-
return "null";
192-
}
193-
return o.toString().replace("\n", "\n ");
180+
return ReflectionToStringBuilderUtils.reflectOnlySelectedFields(this, "anonymousUser", "clients", "index", "protocols");
194181
}
195182
}

‎plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/FileInfo.java‎

Lines changed: 2 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import com.fasterxml.jackson.annotation.JsonInclude;
2525
import com.fasterxml.jackson.annotation.JsonProperty;
2626
import com.fasterxml.jackson.annotation.JsonValue;
27+
import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
2728

2829
import java.time.OffsetDateTime;
2930
import java.util.Objects;
@@ -263,35 +264,6 @@ public int hashCode() {
263264

264265
@Override
265266
public String toString() {
266-
StringBuilder sb = new StringBuilder();
267-
sb.append("class FileInfo {\n");
268-
sb.append(" bytesUsed: ").append(toIndentedString(bytesUsed)).append("\n");
269-
sb.append(" creationTime: ").append(toIndentedString(creationTime)).append("\n");
270-
sb.append(" fillEnabled: ").append(toIndentedString(fillEnabled)).append("\n");
271-
sb.append(" isEmpty: ").append(toIndentedString(isEmpty)).append("\n");
272-
sb.append(" isSnapshot: ").append(toIndentedString(isSnapshot)).append("\n");
273-
sb.append(" isVmAligned: ").append(toIndentedString(isVmAligned)).append("\n");
274-
sb.append(" modifiedTime: ").append(toIndentedString(modifiedTime)).append("\n");
275-
sb.append(" name: ").append(toIndentedString(name)).append("\n");
276-
sb.append(" overwriteEnabled: ").append(toIndentedString(overwriteEnabled)).append("\n");
277-
sb.append(" path: ").append(toIndentedString(path)).append("\n");
278-
sb.append(" size: ").append(toIndentedString(size)).append("\n");
279-
sb.append(" target: ").append(toIndentedString(target)).append("\n");
280-
sb.append(" type: ").append(toIndentedString(type)).append("\n");
281-
sb.append(" uniqueBytes: ").append(toIndentedString(uniqueBytes)).append("\n");
282-
sb.append(" unixPermissions: ").append(toIndentedString(unixPermissions)).append("\n");
283-
sb.append("}");
284-
return sb.toString();
285-
}
286-
287-
/**
288-
* Convert the given object to string with each line indented by 4 spaces
289-
* (except the first line).
290-
*/
291-
private String toIndentedString(Object o) {
292-
if (o == null) {
293-
return "null";
294-
}
295-
return o.toString().replace("\n", "\n ");
267+
return ReflectionToStringBuilderUtils.reflectOnlySelectedFields(this, "name", "path", "type", "size", "bytesUsed", "creationTime", "modifiedTime", "unixPermissions");
296268
}
297269
}

‎plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/Igroup.java‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
2323
import com.fasterxml.jackson.annotation.JsonInclude;
2424
import com.fasterxml.jackson.annotation.JsonProperty;
25+
import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
2526

2627
import java.util.List;
2728
import java.util.Objects;
@@ -249,9 +250,6 @@ public boolean equals(Object obj) {
249250

250251
@Override
251252
public String toString() {
252-
return "Igroup [deleteOnUnmap=" + deleteOnUnmap + ", initiators=" + initiators + ", lunMaps=" + lunMaps
253-
+ ", name=" + name + ", replication=" + ", osType=" + osType + ", parentIgroups="
254-
+ parentIgroups + ", igroups=" + igroups + ", protocol=" + protocol + ", svm=" + svm + ", uuid=" + uuid
255-
+ ", portset=" + "]";
253+
return ReflectionToStringBuilderUtils.reflectOnlySelectedFields(this, "name", "uuid", "osType", "protocol", "initiators", "svm");
256254
}
257255
}

‎plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/IpInterface.java‎

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
2323
import com.fasterxml.jackson.annotation.JsonInclude;
2424
import com.fasterxml.jackson.annotation.JsonProperty;
25+
import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
2526

2627
import java.util.List;
2728
import java.util.Objects;
@@ -108,13 +109,7 @@ public int hashCode() {
108109

109110
@Override
110111
public String toString() {
111-
return "IpInterface{" +
112-
"uuid='" + uuid + '\'' +
113-
", name='" + name + '\'' +
114-
", ip=" + ip +
115-
", svm=" + svm +
116-
", services=" + services +
117-
'}';
112+
return ReflectionToStringBuilderUtils.reflectOnlySelectedFields(this, "uuid", "name", "ip", "svm", "services");
118113
}
119114

120115
// Nested class for IP information
@@ -147,9 +142,7 @@ public int hashCode() {
147142

148143
@Override
149144
public String toString() {
150-
return "IpInfo{" +
151-
"address='" + address + '\'' +
152-
'}';
145+
return ReflectionToStringBuilderUtils.reflectOnlySelectedFields(this, "address");
153146
}
154147
}
155148
}

‎plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/IscsiService.java‎

Lines changed: 3 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
2323
import com.fasterxml.jackson.annotation.JsonInclude;
2424
import com.fasterxml.jackson.annotation.JsonProperty;
25+
import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
2526

2627

2728
/**
@@ -65,11 +66,7 @@ public void setTarget(IscsiServiceTarget target) {
6566

6667
@Override
6768
public String toString() {
68-
return "IscsiService{" +
69-
"enabled=" + enabled +
70-
", svm=" + svm +
71-
", target=" + target +
72-
'}';
69+
return ReflectionToStringBuilderUtils.reflectOnlySelectedFields(this, "enabled", "svm", "target");
7370
}
7471

7572
/**
@@ -102,10 +99,7 @@ public void setName(String name) {
10299

103100
@Override
104101
public String toString() {
105-
return "IscsiServiceTarget{" +
106-
"alias='" + alias + '\'' +
107-
", name='" + name + '\'' +
108-
'}';
102+
return ReflectionToStringBuilderUtils.reflectOnlySelectedFields(this, "alias", "name");
109103
}
110104
}
111105
}

‎plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/Job.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.fasterxml.jackson.annotation.JsonInclude;
2323
import com.fasterxml.jackson.annotation.JsonInclude.Include;
2424
import com.fasterxml.jackson.annotation.JsonProperty;
25+
import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
2526

2627
/**
2728
* @author Administrator
@@ -82,8 +83,7 @@ public void setCode(String code) {
8283
}
8384
@Override
8485
public String toString() {
85-
return "JobDTO [uuid=" + uuid + ", description=" + description + ", state=" + state + ", message="
86-
+ message + ", code=" + code + "]";
86+
return ReflectionToStringBuilderUtils.reflectOnlySelectedFields(this, "uuid", "description", "state", "message", "code");
8787
}
8888

8989
public static class Links {
@@ -115,7 +115,7 @@ public void setCode(String code) {
115115
}
116116
@Override
117117
public String toString() {
118-
return "JobError [errorMesssage=" + errorMesssage + ", code=" + code + "]";
118+
return ReflectionToStringBuilderUtils.reflectOnlySelectedFields(this, "errorMesssage", "code");
119119
}
120120
}
121121
}

‎plugins/storage/volume/ontap/src/main/java/org/apache/cloudstack/storage/feign/model/Lun.java‎

Lines changed: 2 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@
2424
import com.fasterxml.jackson.annotation.JsonInclude;
2525
import com.fasterxml.jackson.annotation.JsonProperty;
2626
import com.fasterxml.jackson.annotation.JsonValue;
27+
import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
2728

2829
import java.util.List;
2930
import java.util.Objects;
@@ -280,34 +281,9 @@ public int hashCode() {
280281

281282
@Override
282283
public String toString() {
283-
StringBuilder sb = new StringBuilder();
284-
sb.append("class Lun {\n");
285-
sb.append(" autoDelete: ").append(toIndentedString(autoDelete)).append("\n");
286-
sb.append(" propertyClass: ").append(toIndentedString(propertyClass)).append("\n");
287-
sb.append(" enabled: ").append(toIndentedString(enabled)).append("\n");
288-
sb.append(" lunMaps: ").append(toIndentedString(lunMaps)).append("\n");
289-
sb.append(" name: ").append(toIndentedString(name)).append("\n");
290-
sb.append(" osType: ").append(toIndentedString(osType)).append("\n");
291-
sb.append(" serialNumber: ").append(toIndentedString(serialNumber)).append("\n");
292-
sb.append(" space: ").append(toIndentedString(space)).append("\n");
293-
sb.append(" svm: ").append(toIndentedString(svm)).append("\n");
294-
sb.append(" uuid: ").append(toIndentedString(uuid)).append("\n");
295-
sb.append("}");
296-
return sb.toString();
284+
return ReflectionToStringBuilderUtils.reflectOnlySelectedFields(this, "name", "uuid", "enabled", "lunMaps", "osType", "serialNumber", "space", "svm");
297285
}
298286

299-
/**
300-
* Convert the given object to string with each line indented by 4 spaces
301-
* (except the first line).
302-
*/
303-
private String toIndentedString(Object o) {
304-
if (o == null) {
305-
return "null";
306-
}
307-
return o.toString().replace("\n", "\n ");
308-
}
309-
310-
311287
public static class Clone {
312288
@JsonProperty("source")
313289
private Source source = null;

0 commit comments

Comments
 (0)