fixups

Author: vishesh92

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() {