From 13e8c3fbeb9039f965980aaf371158fe93f95c37 Mon Sep 17 00:00:00 2001 From: Mikhail Kladkevich Date: Mon, 3 Sep 2018 08:20:37 +0300 Subject: [PATCH] Reimplement toString() by eu.chargetime.ocpp.utilities.MoreObjects.toStringHelper. --- .../eu/chargetime/ocpp/FeatureRepository.java | 4 +-- .../main/java/eu/chargetime/ocpp/Session.java | 3 ++ .../ocpp/utilities/MoreObjects.java | 32 +++++++++++++++++-- .../chargetime/ocpp/model/SOAPHostInfo.java | 16 ++++++---- .../model/core/AuthorizeConfirmation.java | 5 +-- .../ocpp/model/core/AuthorizeRequest.java | 8 ++--- .../core/BootNotificationConfirmation.java | 12 +++---- .../model/core/BootNotificationRequest.java | 24 +++++++------- .../core/ChangeAvailabilityConfirmation.java | 8 ++--- .../model/core/ChangeAvailabilityRequest.java | 10 +++--- .../core/ChangeConfigurationConfirmation.java | 8 ++--- .../core/ChangeConfigurationRequest.java | 10 +++--- .../ocpp/model/core/ChargingProfile.java | 24 +++++++------- .../ocpp/model/core/ChargingSchedule.java | 16 +++++----- .../model/core/ChargingSchedulePeriod.java | 12 +++---- .../model/core/ClearCacheConfirmation.java | 8 ++--- .../ocpp/model/core/ClearCacheRequest.java | 4 ++- .../model/core/DataTransferConfirmation.java | 10 +++--- .../ocpp/model/core/DataTransferRequest.java | 12 +++---- .../core/GetConfigurationConfirmation.java | 10 +++--- .../model/core/GetConfigurationRequest.java | 8 ++--- .../model/core/HeartbeatConfirmation.java | 8 ++--- .../ocpp/model/core/HeartbeatRequest.java | 4 ++- .../chargetime/ocpp/model/core/IdTagInfo.java | 14 ++++---- .../ocpp/model/core/KeyValueType.java | 12 +++---- .../ocpp/model/core/MeterValue.java | 10 +++--- .../model/core/MeterValuesConfirmation.java | 4 ++- .../ocpp/model/core/MeterValuesRequest.java | 12 +++---- .../RemoteStartTransactionConfirmation.java | 8 ++--- .../core/RemoteStartTransactionRequest.java | 12 +++---- .../RemoteStopTransactionConfirmation.java | 8 ++--- .../core/RemoteStopTransactionRequest.java | 8 ++--- .../ocpp/model/core/ResetConfirmation.java | 8 ++--- .../ocpp/model/core/ResetRequest.java | 8 ++--- .../ocpp/model/core/SampledValue.java | 20 ++++++------ .../core/StartTransactionConfirmation.java | 10 +++--- .../model/core/StartTransactionRequest.java | 16 +++++----- .../core/StatusNotificationConfirmation.java | 4 ++- .../model/core/StatusNotificationRequest.java | 20 ++++++------ .../core/StopTransactionConfirmation.java | 8 ++--- .../model/core/StopTransactionRequest.java | 18 +++++------ .../core/UnlockConnectorConfirmation.java | 8 ++--- .../model/core/UnlockConnectorRequest.java | 8 ++--- ...nosticsStatusNotificationConfirmation.java | 4 ++- ...irmwareStatusNotificationConfirmation.java | 4 ++- .../firmware/GetDiagnosticsConfirmation.java | 8 ++--- .../model/firmware/GetDiagnosticsRequest.java | 16 +++++----- .../firmware/UpdateFirmwareConfirmation.java | 4 ++- .../model/firmware/UpdateFirmwareRequest.java | 14 ++++---- .../localauthlist/AuthorizationData.java | 10 +++--- .../GetLocalListVersionConfirmation.java | 8 ++--- .../GetLocalListVersionRequest.java | 4 ++- .../SendLocalListConfirmation.java | 8 ++--- .../localauthlist/SendLocalListRequest.java | 12 +++---- .../TriggerMessageConfirmation.java | 8 ++--- .../remotetrigger/TriggerMessageRequest.java | 10 +++--- .../CancelReservationConfirmation.java | 8 ++--- .../reservation/CancelReservationRequest.java | 8 ++--- .../reservation/ReserveNowConfirmation.java | 8 ++--- .../model/reservation/ReserveNowRequest.java | 16 +++++----- .../SetChargingProfileConfirmation.java | 8 ++--- .../SetChargingProfileRequest.java | 9 +++--- .../test/StartTransactionRequestTest.java | 2 +- 63 files changed, 347 insertions(+), 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 index ce7882539..9c01cecbf 100644 --- 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 index 47f292b63..f07bc0f96 100644 --- 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 index 7df580e04..e78df8698 100644 --- 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) { *

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 index 31a35d81b..ee4337f2b 100644 --- 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 index f46f99cdc..b1ebd1444 100644 --- 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 index 9d6342b45..1628b03ee 100644 --- 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 index 37de8f83a..f55e9bd22 100644 --- 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 index 6fcdc10d0..27e700f27 100644 --- 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 index 3619886d5..24fd961db 100644 --- 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 index b1e7d617b..58496de09 100644 --- 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 index a0b50ae82..d249f2212 100644 --- 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 index 679fbc7b5..3dd5f47d5 100644 --- 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 index a6ccad2b3..42e9c336b 100644 --- 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 index d95e9fa68..d92a08dd3 100644 --- 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 index b850122d5..fec03d27b 100644 --- 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(); } } diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/ClearCacheConfirmation.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/ClearCacheConfirmation.java index 3d67f9224..e929d4578 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/ClearCacheConfirmation.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/ClearCacheConfirmation.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,9 +91,8 @@ public int hashCode() { @Override public String toString() { - return "ClearCacheConfirmation{" + - "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/ClearCacheRequest.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/ClearCacheRequest.java index 5593348ff..079a0b759 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/ClearCacheRequest.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/ClearCacheRequest.java @@ -28,6 +28,7 @@ of this software and associated documentation files (the "Software"), to deal */ import eu.chargetime.ocpp.model.Request; +import eu.chargetime.ocpp.utilities.MoreObjects; import javax.xml.bind.annotation.XmlRootElement; import java.util.Objects; @@ -60,6 +61,7 @@ public int hashCode() { @Override public String toString() { - return "ClearCacheRequest{}" + "{isValid=" + String.valueOf(validate()) + "}"; + return MoreObjects.toStringHelper(this) + .toString(); } } diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/DataTransferConfirmation.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/DataTransferConfirmation.java index b9c85b847..f753c4e37 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/DataTransferConfirmation.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/DataTransferConfirmation.java @@ -27,6 +27,7 @@ */ import eu.chargetime.ocpp.model.Confirmation; +import eu.chargetime.ocpp.utilities.MoreObjects; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; @@ -111,10 +112,9 @@ public int hashCode() { @Override public String toString() { - return "DataTransferConfirmation{" + - "data='" + data + '\'' + - ", status=" + status + - ", isValid=" + String.valueOf(validate()) + - '}'; + return MoreObjects.toStringHelper(this) + .add("status", status) + .add("data", data) + .toString(); } } diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/DataTransferRequest.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/DataTransferRequest.java index ab5338661..ac93d724b 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/DataTransferRequest.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/DataTransferRequest.java @@ -29,6 +29,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; @@ -165,11 +166,10 @@ public int hashCode() { @Override public String toString() { - return "DataTransferRequest{" + - "data='" + data + '\'' + - ", messageId='" + messageId + '\'' + - ", vendorId='" + vendorId + '\'' + - ", isValid=" + String.valueOf(validate()) + - '}'; + return MoreObjects.toStringHelper(this) + .add("vendorId", vendorId) + .add("messageId", messageId) + .add("data", data) + .toString(); } } diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/GetConfigurationConfirmation.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/GetConfigurationConfirmation.java index de6ecc8df..88a2d7f91 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/GetConfigurationConfirmation.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/GetConfigurationConfirmation.java @@ -3,6 +3,7 @@ import eu.chargetime.ocpp.PropertyConstraintException; import eu.chargetime.ocpp.model.Confirmation; import eu.chargetime.ocpp.utilities.ModelUtil; +import eu.chargetime.ocpp.utilities.MoreObjects; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; @@ -134,10 +135,9 @@ public int hashCode() { @Override public String toString() { - return "GetConfigurationConfirmation{" + - "configurationKey=" + Arrays.toString(configurationKey) + - ", unknownKey=" + Arrays.toString(unknownKey) + - ", isValid=" + String.valueOf(validate()) + - '}'; + return MoreObjects.toStringHelper(this) + .add("configurationKey", configurationKey) + .add("unknownKey", unknownKey) + .toString(); } } diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/GetConfigurationRequest.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/GetConfigurationRequest.java index 78df08d69..7225fcb3f 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/GetConfigurationRequest.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/GetConfigurationRequest.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; @@ -98,9 +99,8 @@ public int hashCode() { @Override public String toString() { - return "GetConfigurationRequest{" + - "key=" + Arrays.toString(key) + - ", isValid=" + String.valueOf(validate()) + - '}'; + return MoreObjects.toStringHelper(this) + .add("key", key) + .toString(); } } diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/HeartbeatConfirmation.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/HeartbeatConfirmation.java index 0aa2a7525..a758d0dcc 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/HeartbeatConfirmation.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/HeartbeatConfirmation.java @@ -27,6 +27,7 @@ */ import eu.chargetime.ocpp.model.Confirmation; +import eu.chargetime.ocpp.utilities.MoreObjects; import eu.chargetime.ocpp.utilities.SugarUtil; import javax.xml.bind.annotation.XmlElement; @@ -91,9 +92,8 @@ public int hashCode() { @Override public String toString() { - return "HeartbeatConfirmation{" + - "currentTime='" + SugarUtil.calendarToString(currentTime) + - ", isValid=" + String.valueOf(validate()) + - '}'; + return MoreObjects.toStringHelper(this) + .add("currentTime", currentTime) + .toString(); } } diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/HeartbeatRequest.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/HeartbeatRequest.java index d468c7650..50898cd21 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/HeartbeatRequest.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/HeartbeatRequest.java @@ -27,6 +27,7 @@ */ import eu.chargetime.ocpp.model.Request; +import eu.chargetime.ocpp.utilities.MoreObjects; import javax.xml.bind.annotation.XmlRootElement; import java.util.Objects; @@ -59,6 +60,7 @@ public int hashCode() { @Override public String toString() { - return "HeartbeatRequest" + "{isValid=" + String.valueOf(validate()) + "}"; + return MoreObjects.toStringHelper(this) + .toString(); } } diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/IdTagInfo.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/IdTagInfo.java index 598afc1e5..04a86208a 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/IdTagInfo.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/IdTagInfo.java @@ -28,6 +28,7 @@ of this software and associated documentation files (the "Software"), to deal */ import eu.chargetime.ocpp.model.Validatable; +import eu.chargetime.ocpp.utilities.MoreObjects; import eu.chargetime.ocpp.utilities.SugarUtil; import javax.xml.bind.annotation.XmlElement; @@ -134,6 +135,7 @@ public boolean validate() { valid &= this.status != null; return valid; } + @Override public boolean equals(Object o) { if (this == o) return true; @@ -146,16 +148,16 @@ public boolean equals(Object o) { @Override public int hashCode() { + return Objects.hash(expiryDate, parentIdTag, status); } @Override public String toString() { - return "IdTagInfo{" + - "expiryDate='" + SugarUtil.calendarToString(expiryDate) + - ", parentIdTag='" + parentIdTag + '\'' + - ", status=" + status + - ", isValid=" + String.valueOf(validate()) + - '}'; + return MoreObjects.toStringHelper(this) + .add("expiryDate", expiryDate) + .add("parentIdTag", parentIdTag) + .add("status", status) + .toString(); } } diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/KeyValueType.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/KeyValueType.java index 052492b39..5adc36ae8 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/KeyValueType.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/KeyValueType.java @@ -31,6 +31,7 @@ of this software and associated documentation files (the "Software"), to deal import eu.chargetime.ocpp.PropertyConstraintException; import eu.chargetime.ocpp.model.Validatable; import eu.chargetime.ocpp.utilities.ModelUtil; +import eu.chargetime.ocpp.utilities.MoreObjects; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; @@ -158,11 +159,10 @@ public int hashCode() { @Override public String toString() { - return "KeyValueType{" + - "key='" + key + '\'' + - ", readonly=" + readonly + - ", value='" + value + '\'' + - ", isValid=" + String.valueOf(validate()) + - '}'; + return MoreObjects.toStringHelper(this) + .add("key", key) + .add("readonly", readonly) + .add("value", value) + .toString(); } } diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/MeterValue.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/MeterValue.java index 4ef4d6d92..84586f016 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/MeterValue.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/MeterValue.java @@ -1,6 +1,7 @@ package eu.chargetime.ocpp.model.core; import eu.chargetime.ocpp.model.Validatable; +import eu.chargetime.ocpp.utilities.MoreObjects; import eu.chargetime.ocpp.utilities.SugarUtil; import javax.xml.bind.annotation.XmlElement; @@ -123,10 +124,9 @@ public int hashCode() { @Override public String toString() { - return "MeterValue{" + - "sampledValue=" + Arrays.toString(sampledValue) + - ", timestamp='" + SugarUtil.calendarToString(timestamp) + - ", isValid=" + String.valueOf(validate()) + - '}'; + return MoreObjects.toStringHelper(this) + .add("timestamp", timestamp) + .add("sampledValue", sampledValue) + .toString(); } } diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/MeterValuesConfirmation.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/MeterValuesConfirmation.java index 1f5142747..4aa6d7dd0 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/MeterValuesConfirmation.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/MeterValuesConfirmation.java @@ -27,6 +27,7 @@ */ import eu.chargetime.ocpp.model.Confirmation; +import eu.chargetime.ocpp.utilities.MoreObjects; import javax.xml.bind.annotation.XmlRootElement; import java.util.Objects; @@ -53,6 +54,7 @@ public int hashCode() { @Override public String toString() { - return "MeterValuesConfirmation" + "{isValid=" + String.valueOf(validate()) + "}"; + return MoreObjects.toStringHelper(this) + .toString(); } } diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/MeterValuesRequest.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/MeterValuesRequest.java index c4fb3572a..78270f8a9 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/MeterValuesRequest.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/MeterValuesRequest.java @@ -28,6 +28,7 @@ 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; @@ -147,11 +148,10 @@ public int hashCode() { @Override public String toString() { - return "MeterValuesRequest{" + - "connectorId=" + connectorId + - ", meterValue=" + Arrays.toString(meterValue) + - ", transactionId=" + transactionId + - ", isValid=" + String.valueOf(validate()) + - '}'; + return MoreObjects.toStringHelper(this) + .add("connectorId", connectorId) + .add("transactionId", transactionId) + .add("meterValue", meterValue) + .toString(); } } diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/RemoteStartTransactionConfirmation.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/RemoteStartTransactionConfirmation.java index 35cff91de..bc9dd85d2 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/RemoteStartTransactionConfirmation.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/RemoteStartTransactionConfirmation.java @@ -27,6 +27,7 @@ */ import eu.chargetime.ocpp.model.Confirmation; +import eu.chargetime.ocpp.utilities.MoreObjects; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; @@ -100,9 +101,8 @@ public int hashCode() { @Override public String toString() { - return "RemoteStartTransactionConfirmation{" + - "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/RemoteStartTransactionRequest.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/RemoteStartTransactionRequest.java index 0fcf7ea6c..69e2a1d49 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/RemoteStartTransactionRequest.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/RemoteStartTransactionRequest.java @@ -29,6 +29,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; @@ -152,11 +153,10 @@ public int hashCode() { @Override public String toString() { - return "RemoteStartTransactionRequest{" + - "chargingProfile=" + chargingProfile + - ", connectorId=" + connectorId + - ", idTag='" + idTag + '\'' + - ", isValid=" + String.valueOf(validate()) + - '}'; + return MoreObjects.toStringHelper(this) + .add("connectorId", connectorId) + .add("idTag", idTag) + .add("chargingProfile", chargingProfile) + .toString(); } } diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/RemoteStopTransactionConfirmation.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/RemoteStopTransactionConfirmation.java index 90724e8bc..54d220eb0 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/RemoteStopTransactionConfirmation.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/RemoteStopTransactionConfirmation.java @@ -27,6 +27,7 @@ */ import eu.chargetime.ocpp.model.Confirmation; +import eu.chargetime.ocpp.utilities.MoreObjects; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; @@ -100,9 +101,8 @@ public int hashCode() { @Override public String toString() { - return "RemoteStopTransactionConfirmation{" + - "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/RemoteStopTransactionRequest.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/RemoteStopTransactionRequest.java index c2e9bb209..26c8751fb 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/RemoteStopTransactionRequest.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/RemoteStopTransactionRequest.java @@ -27,6 +27,7 @@ */ import eu.chargetime.ocpp.model.Request; +import eu.chargetime.ocpp.utilities.MoreObjects; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; @@ -84,9 +85,8 @@ public int hashCode() { @Override public String toString() { - return "RemoteStopTransactionRequest{" + - "transactionId=" + transactionId + - ", isValid=" + String.valueOf(validate()) + - '}'; + return MoreObjects.toStringHelper(this) + .add("transactionId", transactionId) + .toString(); } } diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/ResetConfirmation.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/ResetConfirmation.java index 4f29f632d..14dc02199 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/ResetConfirmation.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/ResetConfirmation.java @@ -27,6 +27,7 @@ */ import eu.chargetime.ocpp.model.Confirmation; +import eu.chargetime.ocpp.utilities.MoreObjects; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; @@ -100,9 +101,8 @@ public int hashCode() { @Override public String toString() { - return "ResetConfirmation{" + - "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/ResetRequest.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/ResetRequest.java index c7b6d3860..107629974 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/ResetRequest.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/ResetRequest.java @@ -27,6 +27,7 @@ */ import eu.chargetime.ocpp.model.Request; +import eu.chargetime.ocpp.utilities.MoreObjects; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; @@ -93,9 +94,8 @@ public int hashCode() { @Override public String toString() { - return "ResetRequest{" + - "type=" + type + - ", isValid=" + String.valueOf(validate()) + - '}'; + return MoreObjects.toStringHelper(this) + .add("type", type) + .toString(); } } diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/SampledValue.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/SampledValue.java index 9fd09a33d..24f0a6729 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/SampledValue.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/SampledValue.java @@ -28,6 +28,7 @@ import eu.chargetime.ocpp.PropertyConstraintException; import eu.chargetime.ocpp.model.Validatable; import eu.chargetime.ocpp.utilities.ModelUtil; +import eu.chargetime.ocpp.utilities.MoreObjects; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -358,15 +359,14 @@ public int hashCode() { @Override public String toString() { - return "SampledValue{" + - "context='" + context + '\'' + - ", format=" + format + - ", location=" + location + - ", measurand='" + measurand + '\'' + - ", phase='" + phase + '\'' + - ", unit='" + unit + '\'' + - ", value='" + value + '\'' + - ", isValid=" + String.valueOf(validate()) + - '}'; + return MoreObjects.toStringHelper(this) + .add("value", value) + .add("context", context) + .add("format", format) + .add("measurand", measurand) + .add("phase", phase) + .add("location", location) + .add("unit", unit) + .toString(); } } diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/StartTransactionConfirmation.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/StartTransactionConfirmation.java index b5ad19146..cd2ef31d2 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/StartTransactionConfirmation.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/StartTransactionConfirmation.java @@ -27,6 +27,7 @@ */ import eu.chargetime.ocpp.model.Confirmation; +import eu.chargetime.ocpp.utilities.MoreObjects; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; @@ -105,10 +106,9 @@ public int hashCode() { @Override public String toString() { - return "StartTransactionConfirmation{" + - "idTagInfo=" + idTagInfo + - ", transactionId=" + transactionId + - ", isValid=" + String.valueOf(validate()) + - '}'; + return MoreObjects.toStringHelper(this) + .add("idTagInfo", idTagInfo) + .add("transactionId", transactionId) + .toString(); } } diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/StartTransactionRequest.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/StartTransactionRequest.java index 273eb38ff..fac90594f 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/StartTransactionRequest.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/StartTransactionRequest.java @@ -29,6 +29,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 eu.chargetime.ocpp.utilities.SugarUtil; import javax.xml.bind.annotation.XmlElement; @@ -200,14 +201,13 @@ public int hashCode() { @Override public String toString() { - return "StartTransactionRequest{" + - "connectorId=" + connectorId + - ", idTag='" + idTag + '\'' + - ", meterStart=" + meterStart + - ", reservationId=" + reservationId + - ", timestamp='" + SugarUtil.calendarToString(timestamp) + - ", isValid=" + String.valueOf(validate()) + - '}'; + return MoreObjects.toStringHelper(this) + .add("connectorId", connectorId) + .add("idTag", idTag) + .add("meterStart", meterStart) + .add("reservationId", reservationId) + .add("timestamp", timestamp) + .toString(); } } diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/StatusNotificationConfirmation.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/StatusNotificationConfirmation.java index ac2e6293c..2e1a2ac4d 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/StatusNotificationConfirmation.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/StatusNotificationConfirmation.java @@ -27,6 +27,7 @@ */ import eu.chargetime.ocpp.model.Confirmation; +import eu.chargetime.ocpp.utilities.MoreObjects; import javax.xml.bind.annotation.XmlRootElement; import java.util.Objects; @@ -50,7 +51,8 @@ public int hashCode() { @Override public String toString() { - return "StatusNotificationConfirmation{}" + "{isValid=" + String.valueOf(validate()) + "}"; + return MoreObjects.toStringHelper(this) + .toString(); } } diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/StatusNotificationRequest.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/StatusNotificationRequest.java index 25805702a..708944679 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/StatusNotificationRequest.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/StatusNotificationRequest.java @@ -29,6 +29,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 eu.chargetime.ocpp.utilities.SugarUtil; import javax.xml.bind.annotation.XmlElement; @@ -280,15 +281,14 @@ public int hashCode() { @Override public String toString() { - return "StatusNotificationRequest{" + - "connectorId=" + connectorId + - ", errorCode=" + errorCode + - ", info='" + info + '\'' + - ", status=" + status + - ", timestamp='" + SugarUtil.calendarToString(timestamp) + - ", vendorErrorCode='" + vendorErrorCode + '\'' + - ", vendorId='" + vendorId + '\'' + - ", isValid=" + String.valueOf(validate()) + - '}'; + return MoreObjects.toStringHelper(this) + .add("connectorId", connectorId) + .add("errorCode", errorCode) + .add("info", info) + .add("status", status) + .add("timestamp", timestamp) + .add("vendorId", vendorId) + .add("vendorErrorCode", vendorErrorCode) + .toString(); } } diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/StopTransactionConfirmation.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/StopTransactionConfirmation.java index 8de3e8459..63f3c6b7b 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/StopTransactionConfirmation.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/StopTransactionConfirmation.java @@ -27,6 +27,7 @@ */ import eu.chargetime.ocpp.model.Confirmation; +import eu.chargetime.ocpp.utilities.MoreObjects; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; @@ -84,9 +85,8 @@ public int hashCode() { @Override public String toString() { - return "StopTransactionConfirmation{" + - "idTagInfo=" + idTagInfo + - ", isValid=" + String.valueOf(validate()) + - '}'; + return MoreObjects.toStringHelper(this) + .add("idTagInfo", idTagInfo) + .toString(); } } diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/StopTransactionRequest.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/StopTransactionRequest.java index 3dcc36ebb..b67aa7b43 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/StopTransactionRequest.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/StopTransactionRequest.java @@ -29,6 +29,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 eu.chargetime.ocpp.utilities.SugarUtil; import javax.xml.bind.annotation.XmlElement; @@ -232,14 +233,13 @@ public int hashCode() { @Override public String toString() { - return "StopTransactionRequest{" + - "idTag='" + idTag + '\'' + - ", meterStop=" + meterStop + - ", reason=" + reason + - ", timestamp='" + SugarUtil.calendarToString(timestamp) + - ", transactionData=" + Arrays.toString(transactionData) + - ", transactionId=" + transactionId + - ", isValid=" + String.valueOf(validate()) + - '}'; + return MoreObjects.toStringHelper(this) + .add("idTag", idTag) + .add("meterStop", meterStop) + .add("timestamp", timestamp) + .add("transactionId", transactionId) + .add("reason", reason) + .add("transactionData", transactionData) + .toString(); } } diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/UnlockConnectorConfirmation.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/UnlockConnectorConfirmation.java index ff18814b8..d50c4e38b 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/UnlockConnectorConfirmation.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/UnlockConnectorConfirmation.java @@ -27,6 +27,7 @@ */ import eu.chargetime.ocpp.model.Confirmation; +import eu.chargetime.ocpp.utilities.MoreObjects; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; @@ -100,9 +101,8 @@ public int hashCode() { @Override public String toString() { - return "UnlockConnectorConfirmation{" + - "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/UnlockConnectorRequest.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/UnlockConnectorRequest.java index fd82b43fc..546f0c7d8 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/UnlockConnectorRequest.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/UnlockConnectorRequest.java @@ -28,6 +28,7 @@ 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; @@ -89,9 +90,8 @@ public int hashCode() { @Override public String toString() { - return "UnlockConnectorRequest{" + - "connectorId=" + connectorId + - ", isValid=" + String.valueOf(validate()) + - '}'; + return MoreObjects.toStringHelper(this) + .add("connectorId", connectorId) + .toString(); } } diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/firmware/DiagnosticsStatusNotificationConfirmation.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/firmware/DiagnosticsStatusNotificationConfirmation.java index 2dc324f87..af4f4748f 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/firmware/DiagnosticsStatusNotificationConfirmation.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/firmware/DiagnosticsStatusNotificationConfirmation.java @@ -27,6 +27,7 @@ */ import eu.chargetime.ocpp.model.Confirmation; +import eu.chargetime.ocpp.utilities.MoreObjects; import javax.xml.bind.annotation.XmlRootElement; import java.util.Objects; @@ -57,6 +58,7 @@ public int hashCode() { @Override public String toString() { - return "DiagnosticsStatusNotificationConfirmation{}" + "{isValid=" + String.valueOf(validate()) + "}"; + return MoreObjects.toStringHelper(this) + .toString(); } } diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/firmware/FirmwareStatusNotificationConfirmation.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/firmware/FirmwareStatusNotificationConfirmation.java index a0c857a74..3a3d83955 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/firmware/FirmwareStatusNotificationConfirmation.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/firmware/FirmwareStatusNotificationConfirmation.java @@ -27,6 +27,7 @@ */ import eu.chargetime.ocpp.model.Confirmation; +import eu.chargetime.ocpp.utilities.MoreObjects; import javax.xml.bind.annotation.XmlRootElement; import java.util.Objects; @@ -57,6 +58,7 @@ public int hashCode() { @Override public String toString() { - return "FirmwareStatusNotificationConfirmation{}" + "{isValid=" + String.valueOf(validate()) + "}"; + return MoreObjects.toStringHelper(this) + .toString(); } } diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/firmware/GetDiagnosticsConfirmation.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/firmware/GetDiagnosticsConfirmation.java index 8e92d09e3..30c46bc7f 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/firmware/GetDiagnosticsConfirmation.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/firmware/GetDiagnosticsConfirmation.java @@ -28,6 +28,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.ModelUtil; +import eu.chargetime.ocpp.utilities.MoreObjects; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; @@ -82,9 +83,8 @@ public int hashCode() { @Override public String toString() { - return "GetDiagnosticsConfirmation{" + - "fileName='" + fileName + '\'' + - ", isValid=" + String.valueOf(validate()) + - '}'; + return MoreObjects.toStringHelper(this) + .add("fileName", fileName) + .toString(); } } \ No newline at end of file diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/firmware/GetDiagnosticsRequest.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/firmware/GetDiagnosticsRequest.java index b96d6774b..e6acc94f5 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/firmware/GetDiagnosticsRequest.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/firmware/GetDiagnosticsRequest.java @@ -25,6 +25,7 @@ of this software and associated documentation files (the "Software"), to deal */ import eu.chargetime.ocpp.model.Request; +import eu.chargetime.ocpp.utilities.MoreObjects; import eu.chargetime.ocpp.utilities.SugarUtil; import javax.xml.bind.annotation.XmlElement; @@ -171,13 +172,12 @@ public int hashCode() { @Override public String toString() { - return "GetDiagnosticsRequest{" + - "location='" + location + '\'' + - ", retries=" + retries + - ", retryInterval=" + retryInterval + - ", startTime='" + SugarUtil.calendarToString(startTime) + - ", stopTime='" + SugarUtil.calendarToString(stopTime) + - ", isValid=" + String.valueOf(validate()) + - '}'; + return MoreObjects.toStringHelper(this) + .add("location", location) + .add("retries", retries) + .add("retryInterval", retryInterval) + .add("startTime", startTime) + .add("stopTime", stopTime) + .toString(); } } diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/firmware/UpdateFirmwareConfirmation.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/firmware/UpdateFirmwareConfirmation.java index edda07dcf..c2e0e5d06 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/firmware/UpdateFirmwareConfirmation.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/firmware/UpdateFirmwareConfirmation.java @@ -28,6 +28,7 @@ */ import eu.chargetime.ocpp.model.Confirmation; +import eu.chargetime.ocpp.utilities.MoreObjects; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; @@ -59,6 +60,7 @@ public int hashCode() { @Override public String toString() { - return "UpdateFirmwareConfirmation{}" + "{isValid=" + String.valueOf(validate()) + "}"; + return MoreObjects.toStringHelper(this) + .toString(); } } diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/firmware/UpdateFirmwareRequest.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/firmware/UpdateFirmwareRequest.java index 7869affc9..d8c30114d 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/firmware/UpdateFirmwareRequest.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/firmware/UpdateFirmwareRequest.java @@ -29,6 +29,7 @@ import eu.chargetime.ocpp.PropertyConstraintException; import eu.chargetime.ocpp.model.Request; +import eu.chargetime.ocpp.utilities.MoreObjects; import eu.chargetime.ocpp.utilities.SugarUtil; import javax.xml.bind.annotation.XmlElement; @@ -177,12 +178,11 @@ public int hashCode() { @Override public String toString() { - return "UpdateFirmwareRequest{" + - "location='" + location + '\'' + - ", retries=" + retries + - ", retrieveDate='" + SugarUtil.calendarToString(retrieveDate) + - ", retryInterval=" + retryInterval + - ", isValid=" + validate() + - '}'; + return MoreObjects.toStringHelper(this) + .add("location", location) + .add("retries", retries) + .add("retrieveDate", retrieveDate) + .add("retryInterval", retryInterval) + .toString(); } } diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/localauthlist/AuthorizationData.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/localauthlist/AuthorizationData.java index ded2a5e2d..a0af1079c 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/localauthlist/AuthorizationData.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/localauthlist/AuthorizationData.java @@ -30,6 +30,7 @@ import eu.chargetime.ocpp.model.Validatable; import eu.chargetime.ocpp.model.core.IdTagInfo; import eu.chargetime.ocpp.utilities.ModelUtil; +import eu.chargetime.ocpp.utilities.MoreObjects; import java.util.Objects; @@ -82,10 +83,9 @@ public int hashCode() { @Override public String toString() { - return "AuthorisationData{" + - "idTag='" + idTag + '\'' + - ", idTagInfo=" + idTagInfo + - ", isValid=" + String.valueOf(validate()) + - '}'; + return MoreObjects.toStringHelper(this) + .add("idTag", idTag) + .add("idTagInfo", idTagInfo) + .toString(); } } diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/localauthlist/GetLocalListVersionConfirmation.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/localauthlist/GetLocalListVersionConfirmation.java index cfb8412c5..8cd846441 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/localauthlist/GetLocalListVersionConfirmation.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/localauthlist/GetLocalListVersionConfirmation.java @@ -29,6 +29,7 @@ import eu.chargetime.ocpp.PropertyConstraintException; import eu.chargetime.ocpp.model.Confirmation; +import eu.chargetime.ocpp.utilities.MoreObjects; import java.util.Objects; @@ -90,9 +91,8 @@ public int hashCode() { @Override public String toString() { - return "GetLocalListVersionConfirmation{" + - "listVersion=" + listVersion + - ", isValid=" + String.valueOf(validate()) + - '}'; + return MoreObjects.toStringHelper(this) + .add("listVersion", listVersion) + .toString(); } } diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/localauthlist/GetLocalListVersionRequest.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/localauthlist/GetLocalListVersionRequest.java index c71d9d132..acd00092b 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/localauthlist/GetLocalListVersionRequest.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/localauthlist/GetLocalListVersionRequest.java @@ -27,6 +27,7 @@ */ import eu.chargetime.ocpp.model.Request; +import eu.chargetime.ocpp.utilities.MoreObjects; import java.util.Objects; @@ -54,6 +55,7 @@ public int hashCode() { @Override public String toString() { - return "GetLocalListVersionRequest{}" + "{isValid=" + String.valueOf(validate()) + "}"; + return MoreObjects.toStringHelper(this) + .toString(); } } diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/localauthlist/SendLocalListConfirmation.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/localauthlist/SendLocalListConfirmation.java index 182b6c94f..6c9b038b7 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/localauthlist/SendLocalListConfirmation.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/localauthlist/SendLocalListConfirmation.java @@ -28,6 +28,7 @@ import eu.chargetime.ocpp.PropertyConstraintException; import eu.chargetime.ocpp.model.Confirmation; +import eu.chargetime.ocpp.utilities.MoreObjects; import java.util.Objects; @@ -88,9 +89,8 @@ public int hashCode() { @Override public String toString() { - return "SendLocalListConfirmation{" + - "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/localauthlist/SendLocalListRequest.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/localauthlist/SendLocalListRequest.java index bb616f29d..256feedb9 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/localauthlist/SendLocalListRequest.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/localauthlist/SendLocalListRequest.java @@ -28,6 +28,7 @@ import eu.chargetime.ocpp.PropertyConstraintException; import eu.chargetime.ocpp.model.Request; +import eu.chargetime.ocpp.utilities.MoreObjects; import java.util.Arrays; import java.util.Objects; @@ -108,11 +109,10 @@ public int hashCode() { @Override public String toString() { - return "SendLocalListRequest{" + - "listVersion=" + listVersion + - ", localAuthorisationList=" + Arrays.toString(localAuthorizationList) + - ", updateType=" + updateType + - ", isValid=" + String.valueOf(validate()) + - '}'; + return MoreObjects.toStringHelper(this) + .add("listVersion", listVersion) + .add("localAuthorizationList", localAuthorizationList) + .add("updateType", updateType) + .toString(); } } diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/remotetrigger/TriggerMessageConfirmation.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/remotetrigger/TriggerMessageConfirmation.java index a1c513660..ce97fb16a 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/remotetrigger/TriggerMessageConfirmation.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/remotetrigger/TriggerMessageConfirmation.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,9 +91,8 @@ public int hashCode() { @Override public String toString() { - return "TriggerMessageConfirmation{" + - "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/remotetrigger/TriggerMessageRequest.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/remotetrigger/TriggerMessageRequest.java index 64a208b7a..211e156b1 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/remotetrigger/TriggerMessageRequest.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/remotetrigger/TriggerMessageRequest.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; @@ -121,11 +122,10 @@ public int hashCode() { @Override public String toString() { - return "TriggerMessageRequest{" + - "connectorId=" + connectorId + - ", requestedMessage=" + requestedMessage + - ", isValid=" + String.valueOf(validate()) + - '}'; + return MoreObjects.toStringHelper(this) + .add("connectorId", connectorId) + .add("requestedMessage", requestedMessage) + .toString(); } } diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/reservation/CancelReservationConfirmation.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/reservation/CancelReservationConfirmation.java index 9f3b0a622..713fce4f8 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/reservation/CancelReservationConfirmation.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/reservation/CancelReservationConfirmation.java @@ -28,6 +28,7 @@ */ import eu.chargetime.ocpp.model.Confirmation; +import eu.chargetime.ocpp.utilities.MoreObjects; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; @@ -86,9 +87,8 @@ public int hashCode() { @Override public String toString() { - return "CancelReservationConfirmation{" + - "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/reservation/CancelReservationRequest.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/reservation/CancelReservationRequest.java index d36e9ce0c..101aa26c5 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/reservation/CancelReservationRequest.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/reservation/CancelReservationRequest.java @@ -1,6 +1,7 @@ package eu.chargetime.ocpp.model.reservation; import eu.chargetime.ocpp.model.Request; +import eu.chargetime.ocpp.utilities.MoreObjects; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; @@ -91,9 +92,8 @@ public int hashCode() { @Override public String toString() { - return "CancelReservationRequest{" + - "reservationId=" + reservationId + - ", isValid=" + String.valueOf(validate()) + - '}'; + return MoreObjects.toStringHelper(this) + .add("reservationId", reservationId) + .toString(); } } diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/reservation/ReserveNowConfirmation.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/reservation/ReserveNowConfirmation.java index 9b62d55f9..4209bdf94 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/reservation/ReserveNowConfirmation.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/reservation/ReserveNowConfirmation.java @@ -28,6 +28,7 @@ */ import eu.chargetime.ocpp.model.Confirmation; +import eu.chargetime.ocpp.utilities.MoreObjects; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; @@ -87,9 +88,8 @@ public int hashCode() { @Override public String toString() { - return "ReserveNowConfirmation{" + - "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/reservation/ReserveNowRequest.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/reservation/ReserveNowRequest.java index f2b0d858e..db2dbe8b5 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/reservation/ReserveNowRequest.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/reservation/ReserveNowRequest.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 eu.chargetime.ocpp.utilities.SugarUtil; import javax.xml.bind.annotation.XmlElement; @@ -210,13 +211,12 @@ public int hashCode() { @Override public String toString() { - return "ReserveNowRequest{" + - "connectorId=" + connectorId + - ", expiryDate='" + SugarUtil.calendarToString(expiryDate) + - ", idTag='" + idTag + '\'' + - ", parentIdTag='" + parentIdTag + '\'' + - ", reservationId=" + reservationId + - ", isValid=" + validate() + - '}'; + return MoreObjects.toStringHelper(this) + .add("connectorId", connectorId) + .add("expiryDate", expiryDate) + .add("idTag", idTag) + .add("parentIdTag", parentIdTag) + .add("reservationId", reservationId) + .toString(); } } diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/smartcharging/SetChargingProfileConfirmation.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/smartcharging/SetChargingProfileConfirmation.java index 309abb2a4..df86ddb54 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/smartcharging/SetChargingProfileConfirmation.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/smartcharging/SetChargingProfileConfirmation.java @@ -27,6 +27,7 @@ */ import eu.chargetime.ocpp.model.Confirmation; +import eu.chargetime.ocpp.utilities.MoreObjects; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; @@ -96,9 +97,8 @@ public int hashCode() { @Override public String toString() { - return "SetChargingProfileConfirmation{" + - "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/smartcharging/SetChargingProfileRequest.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/smartcharging/SetChargingProfileRequest.java index 73e2e4d76..b7f5e3fdd 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/smartcharging/SetChargingProfileRequest.java +++ b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/smartcharging/SetChargingProfileRequest.java @@ -4,6 +4,7 @@ import eu.chargetime.ocpp.model.Request; import eu.chargetime.ocpp.model.core.ChargingProfile; import eu.chargetime.ocpp.model.core.ChargingProfilePurposeType; +import eu.chargetime.ocpp.utilities.MoreObjects; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; @@ -124,9 +125,9 @@ public int hashCode() { @Override public String toString() { - return "SetChargingProfileRequest{" + - "connectorId=" + connectorId + - ", chargingProfile=" + chargingProfile + - '}'; + return MoreObjects.toStringHelper(this) + .add("connectorId", connectorId) + .add("chargingProfile", chargingProfile) + .toString(); } } diff --git a/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/model/test/StartTransactionRequestTest.java b/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/model/test/StartTransactionRequestTest.java index 2719090eb..5f16cee51 100644 --- a/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/model/test/StartTransactionRequestTest.java +++ b/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/model/test/StartTransactionRequestTest.java @@ -137,7 +137,7 @@ public void setTimestamp_calendarNow_timestampIsSet() { // When request.setTimestamp(now); - + System.out.println(request.toString()); // Then assertThat(request.objTimestamp(), equalTo(now)); }