Reimplement toString() by eu.chargetime.ocpp.utilities.MoreObjects.to…

…StringHelper.
ChargeTimeEU · Sep 3, 2018 · 13e8c3f · 13e8c3f
1 parent 7dbed72
commit 13e8c3f
Show file tree

Hide file tree

Showing 63 changed files with 347 additions and 294 deletions.
diff --git a/ocpp-common/src/main/java/eu/chargetime/ocpp/FeatureRepository.java b/ocpp-common/src/main/java/eu/chargetime/ocpp/FeatureRepository.java
@@ -99,7 +99,7 @@ private boolean featureContains(Feature feature, Object object) {
     @Override
     public String toString() {
         return MoreObjects.toStringHelper("FeatureRepository")
-                .add("featureList", featureList)
-                .toString();
+                          .add("featureList", featureList)
+                          .toString();
     }
 }
diff --git a/ocpp-common/src/main/java/eu/chargetime/ocpp/Session.java b/ocpp-common/src/main/java/eu/chargetime/ocpp/Session.java
@@ -240,8 +240,11 @@ public int hashCode() {
     public String toString() {
         return MoreObjects.toStringHelper(this)
                           .add("sessionId", sessionId)
+                          .add("communicator", communicator)
                           .add("queue", queue)
+                          .add("dispatcher", dispatcher)
                           .add("featureRepository", featureRepository)
+                          .add("events", events)
                           .toString();
     }
 }
diff --git a/ocpp-common/src/main/java/eu/chargetime/ocpp/utilities/MoreObjects.java b/ocpp-common/src/main/java/eu/chargetime/ocpp/utilities/MoreObjects.java
@@ -279,6 +279,19 @@ public ToStringHelper add(String name, Object value) {
             return this;
         }
 
+        /**
+         * Add field name and value to output.
+         * It's safe to pass null as value.
+         *
+         * @param name field name
+         * @param value field value
+         * @return ToStringHelper instance
+         */
+        public ToStringHelper add(String name, Calendar value) {
+            helperImplementation.add(name, value);
+            return this;
+        }
+
         /**
          * Add field name and value to output.
          * It's safe to pass null as value.
@@ -726,11 +739,19 @@ public ToStringHelperImpl omitNullValues() {
          * is {@code null}, the string {@code "null"} is used, unless {@link #omitNullValues()} is
          * called, in which case this name/value pair will not be added.
          */
-        
+
         public ToStringHelperImpl add(String name, Object value) {
             return addHolder(name, value);
         }
 
+        /**
+         * Adds a name/value pair to the formatted output in {@code name=value} format.
+         */
+
+        public ToStringHelperImpl add(String name, Calendar value) {
+            return addHolder(name, value);
+        }
+
         /**
          * Adds a name/value pair to the formatted output in {@code name=value} format.
          */
@@ -785,7 +806,7 @@ public ToStringHelperImpl add(String name, long value) {
          * <p>It is strongly encouraged to use {@link #add(String, Object)} instead and give value a
          * readable name.
          */
-        
+
         public ToStringHelperImpl addValue(Object value) {
             return addHolder(value);
         }
@@ -912,6 +933,13 @@ private ToStringHelperImpl addHolder(String name, Object value) {
             return this;
         }
 
+        private ToStringHelperImpl addHolder(String name, Calendar value) {
+            ValueHolder valueHolder = addHolder();
+            valueHolder.value = "\"" + SugarUtil.calendarToString(value) + "\"";
+            valueHolder.name = name;
+            return this;
+        }
+
         private static final class ValueHolder {
             String name;
             Object value;

diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/SOAPHostInfo.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/SOAPHostInfo.java
@@ -24,6 +24,8 @@ of this software and associated documentation files (the "Software"), to deal
     SOFTWARE.
  */
 
+import eu.chargetime.ocpp.utilities.MoreObjects;
+
 import java.util.Objects;
 
 public class SOAPHostInfo {
@@ -142,12 +144,12 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "SOAPHostInfo{" +
-                "chargeBoxIdentity='" + chargeBoxIdentity + '\'' +
-                ", fromUrl='" + fromUrl + '\'' +
-                ", toUrl='" + toUrl + '\'' +
-                ", namespace='" + namespace + '\'' +
-                ", isClient=" + isClient +
-                '}';
+        return MoreObjects.toStringHelper(this)
+                .add("chargeBoxIdentity", chargeBoxIdentity)
+                .add("fromUrl", fromUrl)
+                .add("toUrl", toUrl)
+                .add("namespace", namespace)
+                .add("isClient", isClient)
+                .toString();
     }
 }
diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/AuthorizeConfirmation.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/AuthorizeConfirmation.java
@@ -83,11 +83,12 @@ public int hashCode() {
         return Objects.hash(idTagInfo);
     }
 
-    @Override
-    public String toString() {
+//    @Override
+    public String toString2() {
         return "AuthorizeConfirmation{" +
                 "idTagInfo=" + idTagInfo +
                 ", isValid=" + String.valueOf(validate()) +
                 '}';
     }
+
 }
diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/AuthorizeRequest.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/AuthorizeRequest.java
@@ -3,6 +3,7 @@
 import eu.chargetime.ocpp.PropertyConstraintException;
 import eu.chargetime.ocpp.model.Request;
 import eu.chargetime.ocpp.utilities.ModelUtil;
+import eu.chargetime.ocpp.utilities.MoreObjects;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
@@ -106,9 +107,8 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "AuthorizeRequest{" +
-                "idTag='" + idTag + '\'' +
-                ", isValid=" + String.valueOf(validate()) +
-                '}';
+        return MoreObjects.toStringHelper(this)
+                .add("idTag", idTag)
+                .toString();
     }
 }
diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/BootNotificationConfirmation.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/BootNotificationConfirmation.java
@@ -29,6 +29,7 @@ of this software and associated documentation files (the "Software"), to deal
 
 import eu.chargetime.ocpp.PropertyConstraintException;
 import eu.chargetime.ocpp.model.Confirmation;
+import eu.chargetime.ocpp.utilities.MoreObjects;
 import eu.chargetime.ocpp.utilities.SugarUtil;
 
 import javax.xml.bind.annotation.XmlElement;
@@ -162,12 +163,11 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "BootNotificationConfirmation{" +
-                "currentTime='" + SugarUtil.calendarToString(currentTime) +
-                ", interval=" + interval +
-                ", status=" + status +
-                ", isValid=" + String.valueOf(validate()) +
-                '}';
+        return MoreObjects.toStringHelper(this)
+                .add("currentTime", currentTime)
+                .add("interval", interval)
+                .add("status", status)
+                .toString();
     }
 
 }
diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/BootNotificationRequest.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/BootNotificationRequest.java
@@ -30,6 +30,7 @@ of this software and associated documentation files (the "Software"), to deal
 import eu.chargetime.ocpp.PropertyConstraintException;
 import eu.chargetime.ocpp.model.Request;
 import eu.chargetime.ocpp.utilities.ModelUtil;
+import eu.chargetime.ocpp.utilities.MoreObjects;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
@@ -331,17 +332,16 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "BootNotificationRequest{" +
-                "chargeBoxSerialNumber='" + chargeBoxSerialNumber + '\'' +
-                ", chargePointModel='" + chargePointModel + '\'' +
-                ", chargePointSerialNumber='" + chargePointSerialNumber + '\'' +
-                ", chargePointVendor='" + chargePointVendor + '\'' +
-                ", firmwareVersion='" + firmwareVersion + '\'' +
-                ", iccid='" + iccid + '\'' +
-                ", imsi='" + imsi + '\'' +
-                ", meterSerialNumber='" + meterSerialNumber + '\'' +
-                ", meterType='" + meterType + '\'' +
-                ", isValid=" + String.valueOf(validate()) +
-                '}';
+        return MoreObjects.toStringHelper(this)
+                .add("chargePointVendor", chargePointVendor)
+                .add("chargePointModel", chargePointModel)
+                .add("chargeBoxSerialNumber", chargeBoxSerialNumber)
+                .add("chargePointSerialNumber", chargePointSerialNumber)
+                .add("firmwareVersion", firmwareVersion)
+                .add("iccid", iccid)
+                .add("imsi", imsi)
+                .add("meterSerialNumber", meterSerialNumber)
+                .add("meterType", meterType)
+                .toString();
     }
 }
diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/ChangeAvailabilityConfirmation.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/ChangeAvailabilityConfirmation.java
@@ -28,6 +28,7 @@ of this software and associated documentation files (the "Software"), to deal
  */
 
 import eu.chargetime.ocpp.model.Confirmation;
+import eu.chargetime.ocpp.utilities.MoreObjects;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
@@ -101,10 +102,9 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "ChangeAvailabilityConfirmation{" +
-                "status=" + status +
-                ", isValid=" + String.valueOf(validate()) +
-                '}';
+        return MoreObjects.toStringHelper(this)
+                .add("status", status)
+                .toString();
     }
 
 }
diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/ChangeAvailabilityRequest.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/ChangeAvailabilityRequest.java
@@ -29,6 +29,7 @@ of this software and associated documentation files (the "Software"), to deal
 
 import eu.chargetime.ocpp.PropertyConstraintException;
 import eu.chargetime.ocpp.model.Request;
+import eu.chargetime.ocpp.utilities.MoreObjects;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
@@ -125,10 +126,9 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "ChangeAvailabilityRequest{" +
-                "connectorId=" + connectorId +
-                ", type=" + type +
-                ", isValid=" + String.valueOf(validate()) +
-                '}';
+        return MoreObjects.toStringHelper(this)
+                .add("connectorId", connectorId)
+                .add("type", type)
+                .toString();
     }
 }
diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/ChangeConfigurationConfirmation.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/ChangeConfigurationConfirmation.java
@@ -28,6 +28,7 @@ of this software and associated documentation files (the "Software"), to deal
  */
 
 import eu.chargetime.ocpp.model.Confirmation;
+import eu.chargetime.ocpp.utilities.MoreObjects;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
@@ -90,10 +91,9 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "ChangeConfigurationConfirmation{" +
-                "status=" + status +
-                ", isValid=" + String.valueOf(validate()) +
-                '}';
+        return MoreObjects.toStringHelper(this)
+                .add("status", status)
+                .toString();
     }
 
 }
diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/ChangeConfigurationRequest.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/ChangeConfigurationRequest.java
@@ -29,6 +29,7 @@ of this software and associated documentation files (the "Software"), to deal
 import eu.chargetime.ocpp.PropertyConstraintException;
 import eu.chargetime.ocpp.model.Request;
 import eu.chargetime.ocpp.utilities.ModelUtil;
+import eu.chargetime.ocpp.utilities.MoreObjects;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
@@ -137,10 +138,9 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "ChangeConfigurationRequest{" +
-                "key='" + key + '\'' +
-                ", value='" + value + '\'' +
-                ", isValid=" + String.valueOf(validate()) +
-                '}';
+        return MoreObjects.toStringHelper(this)
+                .add("key", key)
+                .add("value", value)
+                .toString();
     }
 }
diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/ChargingProfile.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/ChargingProfile.java
@@ -2,6 +2,7 @@
 
 import eu.chargetime.ocpp.PropertyConstraintException;
 import eu.chargetime.ocpp.model.Validatable;
+import eu.chargetime.ocpp.utilities.MoreObjects;
 import eu.chargetime.ocpp.utilities.SugarUtil;
 
 import javax.xml.bind.annotation.XmlElement;
@@ -224,17 +225,16 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "ChargingProfile{" +
-                "chargingProfileId=" + chargingProfileId +
-                ", chargingProfileKind=" + chargingProfileKind +
-                ", chargingProfilePurpose=" + chargingProfilePurpose +
-                ", chargingSchedule=" + chargingSchedule +
-                ", recurrencyKind=" + recurrencyKind +
-                ", stackLevel=" + stackLevel +
-                ", transactionId=" + transactionId +
-                ", validFrom='" + SugarUtil.calendarToString(validFrom) +
-                ", validTo='" + SugarUtil.calendarToString(validTo) +
-                ", isValid=" + String.valueOf(validate()) +
-                '}';
+        return MoreObjects.toStringHelper(this)
+                .add("chargingProfileId", chargingProfileId)
+                .add("transactionId", transactionId)
+                .add("stackLevel", stackLevel)
+                .add("chargingProfilePurpose", chargingProfilePurpose)
+                .add("chargingProfileKind", chargingProfileKind)
+                .add("recurrencyKind", recurrencyKind)
+                .add("validFrom", validFrom)
+                .add("validTo", validTo)
+                .add("chargingSchedule", chargingSchedule)
+                .toString();
     }
 }
diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/ChargingSchedule.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/ChargingSchedule.java
@@ -27,6 +27,7 @@
  */
 
 import eu.chargetime.ocpp.model.Validatable;
+import eu.chargetime.ocpp.utilities.MoreObjects;
 import eu.chargetime.ocpp.utilities.SugarUtil;
 
 import javax.xml.bind.annotation.XmlElement;
@@ -208,13 +209,12 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "ChargingSchedule{" +
-                "chargingRateUnit=" + chargingRateUnit +
-                ", chargingSchedulePeriod=" + Arrays.toString(chargingSchedulePeriod) +
-                ", duration=" + duration +
-                ", minChargingRate=" + minChargingRate +
-                ", startSchedule='" + SugarUtil.calendarToString(startSchedule) +
-                ", isValid=" + String.valueOf(validate()) +
-                '}';
+        return MoreObjects.toStringHelper(this)
+                .add("duration", duration)
+                .add("startSchedule", startSchedule)
+                .add("chargingRateUnit", chargingRateUnit)
+                .add("chargingSchedulePeriod", chargingSchedulePeriod)
+                .add("minChargingRate", minChargingRate)
+                .toString();
     }
 }
diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/ChargingSchedulePeriod.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/ChargingSchedulePeriod.java
@@ -27,6 +27,7 @@
  */
 
 import eu.chargetime.ocpp.model.Validatable;
+import eu.chargetime.ocpp.utilities.MoreObjects;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
@@ -138,11 +139,10 @@ public int hashCode() {
 
     @Override
     public String toString() {
-        return "ChargingSchedulePeriod{" +
-                "limit=" + limit +
-                ", numberPhases=" + numberPhases +
-                ", startPeriod=" + startPeriod +
-                ", isValid=" + String.valueOf(validate()) +
-                '}';
+        return MoreObjects.toStringHelper(this)
+                .add("startPeriod", startPeriod)
+                .add("limit", limit)
+                .add("numberPhases", numberPhases)
+                .toString();
     }
 }