Skip to content

Commit 499df2d

Browse files
vishesh92vishesh92
committed
Fixups
1 parent 7ba32df commit 499df2d

File tree

77 files changed

+202
-221
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+202
-221
lines changed

‎agent/src/main/java/com/cloud/agent/Agent.java‎

Lines changed: 10 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -132,8 +132,8 @@ public int value() {
132132
ServerResource _resource;
133133
Link _link;
134134
Long _id;
135-
String uuid;
136-
String name;
135+
String _uuid;
136+
String _name;
137137

138138
Timer _timer = new Timer("Agent Timer");
139139
Timer certTimer;
@@ -184,10 +184,10 @@ public Agent(final IAgentShell shell, final int localAgentId, final ServerResour
184184
resource.setAgentControl(this);
185185

186186
final String value = _shell.getPersistentProperty(getResourceName(), "id");
187-
uuid = _shell.getPersistentProperty(getResourceName(), "uuid");
188-
name = _shell.getPersistentProperty(getResourceName(), "name");
187+
_uuid = _shell.getPersistentProperty(getResourceName(), "uuid");
188+
_name = _shell.getPersistentProperty(getResourceName(), "name");
189189
_id = value != null ? Long.parseLong(value) : null;
190-
logger.info("Initialising agent [id: {}, uuid: {}, name: {}]", ObjectUtils.defaultIfNull(_id, ""), uuid, name);
190+
logger.info("Initialising agent [id: {}, uuid: {}, name: {}]", ObjectUtils.defaultIfNull(_id, ""), _uuid, _name);
191191

192192
final Map<String, Object> params = new HashMap<>();
193193

@@ -217,7 +217,7 @@ public Agent(final IAgentShell shell, final int localAgentId, final ServerResour
217217
"agentRequest-Handler"));
218218

219219
logger.info("Agent [id = {}, uuid: {}, name: {}] : type = {} : zone = {} : pod = {} : workers = {} : host = {} : port = {}",
220-
ObjectUtils.defaultIfNull(_id, "new"), uuid, name, getResourceName(),
220+
ObjectUtils.defaultIfNull(_id, "new"), _uuid, _name, getResourceName(),
221221
_shell.getZone(), _shell.getPod(), _shell.getWorkers(), host, _shell.getPort());
222222
}
223223

@@ -382,28 +382,25 @@ public Long getId() {
382382
}
383383

384384
public void setId(final Long id) {
385-
logger.debug("Set agent id {}", id);
386385
_id = id;
387386
_shell.setPersistentProperty(getResourceName(), "id", Long.toString(id));
388387
}
389388

390389
public String getUuid() {
391-
return uuid;
390+
return _uuid;
392391
}
393392

394393
public void setUuid(String uuid) {
395-
logger.debug("Set agent uuid {}", uuid);
396-
this.uuid = uuid;
394+
this._uuid = uuid;
397395
_shell.setPersistentProperty(getResourceName(), "uuid", uuid);
398396
}
399397

400398
public String getName() {
401-
return name;
399+
return _name;
402400
}
403401

404402
public void setName(String name) {
405-
logger.debug("Set agent name {}", name);
406-
this.name = name;
403+
this._name = name;
407404
_shell.setPersistentProperty(getResourceName(), "name", name);
408405
}
409406

‎api/src/main/java/com/cloud/agent/api/to/NfsTO.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@
1717
package com.cloud.agent.api.to;
1818

1919
import com.cloud.storage.DataStoreRole;
20+
import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
2021

2122
public class NfsTO implements DataStoreTO {
2223

@@ -41,6 +42,13 @@ public NfsTO(String url, DataStoreRole role) {
4142

4243
}
4344

45+
@Override
46+
public String toString() {
47+
return String.format("NfsTO %s",
48+
ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
49+
this, "uuid", "_url", "_role", "nfsVersion"));
50+
}
51+
4452
@Override
4553
public String getUrl() {
4654
return _url;

‎api/src/main/java/com/cloud/agent/api/to/S3TO.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.cloud.agent.api.LogLevel.Log4jLevel;
2323
import com.cloud.storage.DataStoreRole;
2424
import com.cloud.utils.storage.S3.ClientOptions;
25+
import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
2526

2627
public final class S3TO implements ClientOptions, DataStoreTO {
2728

@@ -68,6 +69,13 @@ public S3TO(final Long id, final String uuid, final String accessKey, final Stri
6869

6970
}
7071

72+
@Override
73+
public String toString() {
74+
return String.format("S3TO %s",
75+
ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
76+
this, "id", "uuid", "bucketName"));
77+
}
78+
7179
public Long getId() {
7280
return this.id;
7381
}

‎api/src/main/java/com/cloud/agent/api/to/SwiftTO.java‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818

1919
import com.cloud.storage.DataStoreRole;
2020
import com.cloud.utils.SwiftUtil;
21+
import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
2122

2223
public class SwiftTO implements DataStoreTO, SwiftUtil.SwiftClientCfg {
2324
Long id;
@@ -41,6 +42,13 @@ public SwiftTO(Long id, String url, String account, String userName, String key,
4142
this.storagePolicy = storagePolicy;
4243
}
4344

45+
@Override
46+
public String toString() {
47+
return String.format("SwiftTO %s",
48+
ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
49+
this, "id", "account", "userName"));
50+
}
51+
4452
public Long getId() {
4553
return id;
4654
}

‎api/src/main/java/com/cloud/network/NetworkProfile.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
import com.cloud.network.Networks.BroadcastDomainType;
2323
import com.cloud.network.Networks.Mode;
2424
import com.cloud.network.Networks.TrafficType;
25+
import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
2526

2627
public class NetworkProfile implements Network {
2728
private final long id;
@@ -386,7 +387,9 @@ public Integer getNetworkCidrSize() {
386387

387388
@Override
388389
public String toString() {
389-
return String.format("NetworkProfile {\"id\": %s, \"name\": \"%s\", \"uuid\": \"%s\", \"networkofferingid\": %d}", id, name, uuid, networkOfferingId);
390+
return String.format("NetworkProfile %s",
391+
ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
392+
this, "id", "uuid", "name", "networkOfferingId"));
390393
}
391394

392395
}

‎api/src/main/java/org/apache/cloudstack/api/command/user/snapshot/CreateSnapshotFromVMSnapshotCmd.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -165,8 +165,8 @@ public void create() throws ResourceAllocationException {
165165
@Override
166166
public void execute() {
167167
VMSnapshot vmSnapshot = _vmSnapshotService.getVMSnapshotById(getVMSnapshotId());
168-
logger.info("CreateSnapshotFromVMSnapshotCmd with vm snapshot {} with id {} and snapshot [id: {}, uuid: {}] starts: {}", vmSnapshot, getVMSnapshotId(), getEntityId(), getEntityUuid(), System.currentTimeMillis());
169-
CallContext.current().setEventDetails("Vm Snapshot Id: "+ vmSnapshot.getUuid());
168+
logger.info("CreateSnapshotFromVMSnapshotCmd with vm snapshot {} with id {} and snapshot [id: {}, uuid: {}]", vmSnapshot, getVMSnapshotId(), getEntityId(), getEntityUuid());
169+
CallContext.current().setEventDetails("Vm Snapshot Id: " + vmSnapshot.getUuid());
170170
Snapshot snapshot = null;
171171
try {
172172
snapshot = _snapshotService.backupSnapshotFromVmSnapshot(getEntityId(), getVmId(), getVolumeId(), getVMSnapshotId());

‎api/src/main/java/org/apache/cloudstack/vm/UnmanagedInstanceTO.java‎

Lines changed: 11 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,8 @@
1717

1818
package org.apache.cloudstack.vm;
1919

20+
import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
21+
2022
import static com.cloud.utils.NumbersUtil.toHumanReadableSize;
2123

2224
import java.util.List;
@@ -181,12 +183,9 @@ public void setVncPassword(String vncPassword) {
181183

182184
@Override
183185
public String toString() {
184-
return "UnmanagedInstanceTO{" +
185-
"name='" + name + '\'' +
186-
", internalCSName='" + internalCSName + '\'' +
187-
", hostName='" + hostName + '\'' +
188-
", clusterName='" + clusterName + '\'' +
189-
'}';
186+
return String.format("UnmanagedInstanceTO %s",
187+
ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
188+
this, "name", "internalCSName", "hostName", "clusterName"));
190189
}
191190

192191
public static class Disk {
@@ -332,12 +331,9 @@ public int getDatastorePort() {
332331

333332
@Override
334333
public String toString() {
335-
return "Disk {" +
336-
"diskId='" + diskId + '\'' +
337-
", capacity=" + toHumanReadableSize(capacity) +
338-
", controller='" + controller + '\'' +
339-
", controllerUnit=" + controllerUnit +
340-
"}";
334+
return String.format("Disk %s",
335+
ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
336+
this, "diskId", "internalCSName", "controller", "controllerUnit"));
341337
}
342338
}
343339

@@ -434,11 +430,9 @@ public void setPciSlot(String pciSlot) {
434430

435431
@Override
436432
public String toString() {
437-
return "Nic{" +
438-
"nicId='" + nicId + '\'' +
439-
", adapterType='" + adapterType + '\'' +
440-
", macAddress='" + macAddress + '\'' +
441-
"}";
433+
return String.format("Nic %s",
434+
ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
435+
this, "nicId", "adapterType", "macAddress"));
442436
}
443437
}
444438
}

‎api/src/test/java/com/cloud/agent/api/to/LoadBalancerTOTest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -41,19 +41,19 @@ public class LoadBalancerTOTest {
4141
LoadBalancerTO.AutoScaleVmGroupTO vmGroup;
4242

4343
private static final Long counterId = 1L;
44-
private static final String counterUiid = "1111-1111-1100";
44+
private static final String counterUuid = "1111-1111-1100";
4545
private static final String counterName = "counter name";
4646
private static final Counter.Source counterSource = Counter.Source.CPU;
4747
private static final String counterValue = "counter value";
4848
private static final String counterProvider = "VIRTUALROUTER";
4949

5050
private static final Long conditionId = 2L;
51-
private static final String conditionUiid = "1111-1111-1110";
51+
private static final String conditionUuid = "1111-1111-1110";
5252
private static final Long threshold = 100L;
5353
private static final Condition.Operator relationalOperator = Condition.Operator.GT;
5454

5555
private static final Long scaleUpPolicyId = 11L;
56-
private static final String scaleUpPolicyUiid = "1111-1111-1111";
56+
private static final String scaleUpPolicyUuid = "1111-1111-1111";
5757
private static final int scaleUpPolicyDuration = 61;
5858
private static final int scaleUpPolicyQuietTime = 31;
5959
private static final Date scaleUpPolicyLastQuietTime = new Date();
@@ -88,12 +88,12 @@ public class LoadBalancerTOTest {
8888

8989
@Before
9090
public void setUp() {
91-
counter = new LoadBalancerTO.CounterTO(counterId, counterUiid, counterName, counterSource, counterValue, counterProvider);
92-
condition = new LoadBalancerTO.ConditionTO(conditionId, conditionUiid, threshold, relationalOperator, counter);
93-
scaleUpPolicy = new LoadBalancerTO.AutoScalePolicyTO(scaleUpPolicyId, scaleUpPolicyUiid, scaleUpPolicyDuration,
91+
counter = new LoadBalancerTO.CounterTO(counterId, counterUuid, counterName, counterSource, counterValue, counterProvider);
92+
condition = new LoadBalancerTO.ConditionTO(conditionId, conditionUuid, threshold, relationalOperator, counter);
93+
scaleUpPolicy = new LoadBalancerTO.AutoScalePolicyTO(scaleUpPolicyId, scaleUpPolicyUuid, scaleUpPolicyDuration,
9494
scaleUpPolicyQuietTime, scaleUpPolicyLastQuietTime,
9595
AutoScalePolicy.Action.SCALEUP, Arrays.asList(new LoadBalancerTO.ConditionTO[]{ condition }), false);
96-
scaleDownPolicy = new LoadBalancerTO.AutoScalePolicyTO(scaleDownPolicyId, scaleUpPolicyUiid, scaleDownPolicyDuration,
96+
scaleDownPolicy = new LoadBalancerTO.AutoScalePolicyTO(scaleDownPolicyId, scaleUpPolicyUuid, scaleDownPolicyDuration,
9797
scaleDownPolicyQuietTime, scaleDownPolicyLastQuietTime,
9898
AutoScalePolicy.Action.SCALEDOWN, Arrays.asList(new LoadBalancerTO.ConditionTO[]{ condition }), false);
9999
vmProfile = new LoadBalancerTO.AutoScaleVmProfileTO(zoneId, domainId, cloudStackApiUrl, autoScaleUserApiKey,
@@ -116,7 +116,7 @@ public void testCounterTO() {
116116
@Test
117117
public void testConditionTO() {
118118
Assert.assertEquals(conditionId, condition.getId());
119-
Assert.assertEquals(conditionUiid, condition.getUuid());
119+
Assert.assertEquals(conditionUuid, condition.getUuid());
120120
Assert.assertEquals((long) threshold, condition.getThreshold());
121121
Assert.assertEquals(relationalOperator, condition.getRelationalOperator());
122122
Assert.assertEquals(counter, condition.getCounter());

‎core/src/main/java/org/apache/cloudstack/storage/to/ImageStoreTO.java‎

Lines changed: 4 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,7 @@
2323

2424
import com.cloud.agent.api.to.DataStoreTO;
2525
import com.cloud.storage.DataStoreRole;
26+
import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
2627

2728
public class ImageStoreTO implements DataStoreTO {
2829
private String type;
@@ -78,15 +79,9 @@ public DataStoreRole getRole() {
7879

7980
@Override
8081
public String toString() {
81-
return new StringBuilder("ImageStoreTO[type=").append(type)
82-
.append("|provider=")
83-
.append(providerName)
84-
.append("|role=")
85-
.append(role)
86-
.append("|uri=")
87-
.append(uri)
88-
.append("]")
89-
.toString();
82+
return String.format("ImageStoreTO %s",
83+
ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
84+
this, "uuid", "type", "providerName", "role", "uri"));
9085
}
9186

9287
@Override

‎core/src/main/java/org/apache/cloudstack/storage/to/PrimaryDataStoreTO.java‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import com.cloud.agent.api.to.DataStoreTO;
2727
import com.cloud.storage.DataStoreRole;
2828
import com.cloud.storage.Storage.StoragePoolType;
29+
import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
2930

3031
public class PrimaryDataStoreTO implements DataStoreTO {
3132
public static final String MANAGED = PrimaryDataStore.MANAGED;
@@ -145,7 +146,9 @@ public String getPathSeparator() {
145146

146147
@Override
147148
public String toString() {
148-
return String.format("PrimaryDataStoreTO[uuid=%s|name=%s|id=%d|pooltype=%s]", uuid, name, id, poolType);
149+
return String.format("PrimaryDataStoreTO %s",
150+
ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
151+
this, "id", "uuid", "name", "poolType"));
149152
}
150153

151154
public Boolean isFullCloneFlag() {

0 commit comments

Comments
 (0)