fixups

Author: vishesh92

engine/schema/src/main/java/com/cloud/dc/VmwareDatacenterVO.java

@@ -28,6 +28,7 @@
 
 import com.cloud.utils.NumbersUtil;
 import com.cloud.utils.db.Encrypt;
+import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
 
 /**
  * VmwareDatacenterVO contains information of Vmware Datacenter associated with a CloudStack zone.
@@ -125,7 +126,9 @@ public void setPassword(String password) {
 
     @Override
     public String toString() {
-        return new StringBuilder("VmwareDatacenter[").append(guid).append("]").toString();
+        return String.format("VmwareDatacenter %s",
+                ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
+                        this, "id", "uuid", "guid"));
     }
 
     @Override

engine/schema/src/main/java/com/cloud/storage/BucketVO.java

@@ -19,6 +19,7 @@
 import com.cloud.utils.db.GenericDao;
 import com.google.gson.annotations.Expose;
 import org.apache.cloudstack.storage.object.Bucket;
+import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
 import org.apache.commons.lang3.builder.ToStringBuilder;
 import org.apache.commons.lang3.builder.ToStringStyle;
 
@@ -257,7 +258,8 @@ public Class<?> getEntityType() {
 
     @Override
     public String toString() {
-        return String.format("Bucket %s", new ToStringBuilder(this, ToStringStyle.JSON_STYLE).append("uuid", getUuid()).append("name", getName())
-                .append("ObjectStoreId", getObjectStoreId()).toString());
+        return String.format("Bucket %s",
+                ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
+                        this, "id", "uuid", "name", "objectStoreId"));
     }
 }

engine/schema/src/main/java/org/apache/cloudstack/secstorage/HeuristicVO.java

@@ -120,6 +120,8 @@ public void setHeuristicRule(String heuristicRule) {
 
     @Override
     public String toString() {
-        return ReflectionToStringBuilderUtils.reflectOnlySelectedFields(this, "name", "heuristicRule", "type");
+        return String.format("Heuristic %s",
+                ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
+                        this, "id", "uuid", "name", "heuristicRule", "type"));
     }
 }

engine/schema/src/main/java/org/apache/cloudstack/storage/datastore/db/ObjectStoreVO.java

@@ -146,6 +146,6 @@ public void setDetails(Map<String, String> details) {
     public String toString() {
         return String.format("ObjectStore %s",
                 ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
-                        this, "id", "name", "uuid", "providerName"));
+                        this, "id", "uuid", "name", "providerName"));
     }
 }

engine/schema/src/main/java/org/apache/cloudstack/storage/sharedfs/SharedFSVO.java

@@ -125,7 +125,7 @@ public SharedFSVO(String name, String description, long domainId, long accountId
     public String toString() {
         return String.format("SharedFS %s",
                 ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
-                        this, "id", "name", "uuid"));
+                        this, "id", "uuid", "name"));
     }
 
     @Override

engine/schema/src/main/java/org/apache/cloudstack/vm/schedule/VMScheduledJobVO.java

@@ -78,7 +78,7 @@ public VMScheduledJobVO(long vmId, long vmScheduleId, VMSchedule.Action action,
     public String toString() {
         return String.format("VMScheduledJob %s",
                 ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
-                        this, "id", "uuid", "action", "vmScheduleId", "vmId"));
+                        this, "id", "uuid", "action", "vmScheduleId", "vmId", "asyncJobId"));
     }
 
     @Override

engine/storage/object/src/main/java/org/apache/cloudstack/storage/object/store/ObjectStoreImpl.java

@@ -30,6 +30,7 @@
 import org.apache.cloudstack.storage.datastore.db.ObjectStoreVO;
 import org.apache.cloudstack.storage.object.ObjectStoreDriver;
 import org.apache.cloudstack.storage.object.ObjectStoreEntity;
+import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
 
 import java.util.Date;
 import java.util.List;
@@ -59,10 +60,9 @@ public static ObjectStoreEntity getDataStore(ObjectStoreVO objectStoreVO, Object
 
     @Override
     public String toString() {
-        return "ObjectStoreImpl{" +
-                "objectStoreVO=" + objectStoreVO +
-                ", provider=" + provider.getName() +
-                '}';
+        return String.format("ObjectStoreImpl %s",
+                ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
+                        this, "objectStoreVO", "provider"));
     }
 
     @Override

framework/events/src/main/java/org/apache/cloudstack/framework/events/Event.java

@@ -21,6 +21,7 @@
 
 import com.google.gson.Gson;
 import com.google.gson.annotations.Expose;
+import org.apache.cloudstack.utils.reflectiontostringbuilderutils.ReflectionToStringBuilderUtils;
 
 public class Event {
 
@@ -51,14 +52,9 @@ public Event(String eventSource, String eventCategory, String eventType, String
 
     @Override
     public String toString() {
-        return "Event{" +
-                "eventId=" + eventId +
-                ", eventUuid='" + eventUuid + '\'' +
-                ", eventType='" + eventType + '\'' +
-                ", resourceType='" + resourceType + '\'' +
-                ", resourceUUID='" + resourceUUID + '\'' +
-                ", description='" + description + '\'' +
-                '}';
+        return String.format("Event %s",
+                ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
+                        this, "eventId", "eventUuid", "eventType", "resourceType", "resourceUUID", "description"));
     }
 
     public Long getEventId() {

plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/vo/WebhookDeliveryJoinVO.java

@@ -173,8 +173,8 @@ public Date getEndTime() {
 
     @Override
     public String toString() {
-        return String.format("WebhookDelivery [%s]", ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
-                this, "id", "uuid", "webhookId", "startTime", "success"));
+        return String.format("WebhookDelivery %s", ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
+                this, "id", "uuid", "webhookId", "webhookName", "startTime", "success"));
     }
 
     public WebhookDeliveryJoinVO() {

plugins/event-bus/webhook/src/main/java/org/apache/cloudstack/mom/webhook/vo/WebhookDeliveryVO.java

@@ -130,7 +130,7 @@ public Date getEndTime() {
 
     @Override
     public String toString() {
-        return String.format("WebhookDelivery [%s]", ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
+        return String.format("WebhookDelivery %s", ReflectionToStringBuilderUtils.reflectOnlySelectedFields(
                 this, "id", "uuid", "webhookId", "startTime", "success"));
     }