Added XML annotations to all models.

Author: TVolden

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/AuthorizeConfirmation.java

@@ -29,9 +29,13 @@ of this software and associated documentation files (the "Software"), to deal
 
 import eu.chargetime.ocpp.model.Confirmation;
 
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
 /**
  * Sent by the Centarl System to the Charge Point in response to a {@link AuthorizeRequest}.
  */
+@XmlRootElement
 public class AuthorizeConfirmation implements Confirmation
 {
     private IdTagInfo idTagInfo;
@@ -51,6 +55,7 @@ public IdTagInfo getIdTagInfo()
      *
      * @param idTagInfo an instance of {@link IdTagInfo}.
      */
+    @XmlElement
     public void setIdTagInfo(IdTagInfo idTagInfo) {
         this.idTagInfo = idTagInfo;
     }

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/AuthorizeRequest.java

@@ -4,6 +4,9 @@
 import eu.chargetime.ocpp.model.Request;
 import eu.chargetime.ocpp.utilities.ModelUtil;
 
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
 /*
  ChargeTime.eu - Java-OCA-OCPP
  Copyright (C) 2015-2016 Thomas Volden <[email protected]>
@@ -34,6 +37,7 @@ of this software and associated documentation files (the "Software"), to deal
 /**
  * Sent by the Charge Point to the Central System.
  */
+@XmlRootElement
 public class AuthorizeRequest implements Request
 {
     private String idTag;
@@ -67,6 +71,7 @@ public String getIdTag()
      * @param idTag                         String, max 20 characters. Case insensitive.
      * @throws PropertyConstraintException  field isn't filled out correct.
      */
+    @XmlElement
     public void setIdTag(String idTag) throws PropertyConstraintException {
         if (!ModelUtil.validate(idTag, 20))
             throw new PropertyConstraintException("idTag", idTag, "Exceeded limit");

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/BootNotificationConfirmation.java

@@ -3,6 +3,8 @@
 import eu.chargetime.ocpp.PropertyConstraintException;
 import eu.chargetime.ocpp.model.Confirmation;
 
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.TimeZone;
@@ -39,6 +41,7 @@ of this software and associated documentation files (the "Software"), to deal
  *
  * @see BootNotificationRequest
  */
+@XmlRootElement
 public class BootNotificationConfirmation implements Confirmation
 {
     private Calendar currentTime;
@@ -72,6 +75,7 @@ public Calendar objCurrentTime() {
      *
      * @param currentTime Central System’s current time.
      */
+    @XmlElement
     public void setCurrentTime(Calendar currentTime)
     {
         this.currentTime = currentTime;
@@ -97,6 +101,7 @@ public int getInterval()
      * @param interval heartbeat/delay interval in seconds. Min value 0.
      * @throws PropertyConstraintException field isn't filled out correct.
      */
+    @XmlElement
     public void setInterval(int interval) throws PropertyConstraintException {
         if (interval <= 0)
             throw new PropertyConstraintException("interval", interval, "Must be a positive value");
@@ -129,6 +134,7 @@ public String getStatus()
      *
      * @param status                        Charge Points registration status.
      */
+    @XmlElement
     public void setStatus(RegistrationStatus status) {
         this.status = status;
     }

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/ChangeAvailabilityConfirmation.java

@@ -29,9 +29,13 @@ of this software and associated documentation files (the "Software"), to deal
 
 import eu.chargetime.ocpp.model.Confirmation;
 
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
 /**
  * return by Charge Point to Central System.
  */
+@XmlRootElement
 public class ChangeAvailabilityConfirmation implements Confirmation {
 
     private AvailabilityStatus status;
@@ -59,6 +63,7 @@ public AvailabilityStatus objStatus() {
      *
      * @param status the {@link AvailabilityStatus} of connector.
      */
+    @XmlElement
     public void setStatus(AvailabilityStatus status) {
         this.status = status;
     }

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/ChangeAvailabilityRequest.java

@@ -3,6 +3,9 @@
 import eu.chargetime.ocpp.PropertyConstraintException;
 import eu.chargetime.ocpp.model.Request;
 
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
 /*
  ChargeTime.eu - Java-OCA-OCPP
  Copyright (C) 2015-2016 Thomas Volden <[email protected]>
@@ -33,6 +36,7 @@ of this software and associated documentation files (the "Software"), to deal
 /**
  * Sent by the Central System to the Charge Point.
  */
+@XmlRootElement
 public class ChangeAvailabilityRequest implements Request
 {
     private int connectorId = -1;
@@ -55,6 +59,7 @@ public int getConnectorId() {
      * @param connectorId integer, must be a positive number.
      * @throws PropertyConstraintException Value was a negative number.
      */
+    @XmlElement
     public void setConnectorId(int connectorId) throws PropertyConstraintException {
         if (connectorId < 0)
             throw new PropertyConstraintException("connectorId", connectorId, "Must be >= 0");
@@ -85,6 +90,7 @@ public AvailabilityType objType() {
      *
      * @param type    {@link AvailabilityType} of the connector
      */
+    @XmlElement
     public void setType(AvailabilityType type) {
         this.type = type;
     }

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/ChangeConfigurationConfirmation.java

@@ -2,6 +2,9 @@
 
 import eu.chargetime.ocpp.model.Confirmation;
 
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
 /*
  ChargeTime.eu - Java-OCA-OCPP
  Copyright (C) 2015-2016 Thomas Volden <[email protected]>
@@ -32,6 +35,7 @@ of this software and associated documentation files (the "Software"), to deal
 /**
  * Returned from Charge Point to Central System
  */
+@XmlRootElement
 public class ChangeConfigurationConfirmation implements Confirmation {
     private ConfigurationStatus status;
 
@@ -58,6 +62,7 @@ public ConfigurationStatus objStatus() {
      *
      * @param status the {@link ConfigurationStatus}.
      */
+    @XmlElement
     public void setStatus(ConfigurationStatus status) {
         this.status = status;
     }

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/ChangeConfigurationRequest.java

@@ -4,6 +4,9 @@
 import eu.chargetime.ocpp.model.Request;
 import eu.chargetime.ocpp.utilities.ModelUtil;
 
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
 /*
  ChargeTime.eu - Java-OCA-OCPP
 
@@ -36,6 +39,7 @@ of this software and associated documentation files (the "Software"), to deal
  * It is RECOMMENDED that the content and meaning of the 'key' and 'value'
  * fields is agreed upon between Charge Point and Central System.
  */
+@XmlRootElement
 public class ChangeConfigurationRequest implements Request {
     private String key;
     private String value;
@@ -55,6 +59,7 @@ public String getKey() {
      * @param key                           String, max 50 characters, case insensitive.
      * @throws PropertyConstraintException  Value exceeds 50 characters.
      */
+    @XmlElement
     public void setKey(String key) throws PropertyConstraintException {
         if (!isValidKey(key))
             throw new PropertyConstraintException("key", key);
@@ -81,6 +86,7 @@ public String getValue() {
      * @param value                         String, max 500 characters, case insensitive.
      * @throws PropertyConstraintException  Value exceeds 500 characters.
      */
+    @XmlElement
     public void setValue(String value) throws PropertyConstraintException {
         if (!isValidValue(value))
             throw new PropertyConstraintException("value", value);

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/ChargingProfile.java

@@ -3,6 +3,8 @@
 import eu.chargetime.ocpp.PropertyConstraintException;
 import eu.chargetime.ocpp.model.Validatable;
 
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.TimeZone;
@@ -32,6 +34,7 @@
  * OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  * SOFTWARE.
  */
+@XmlRootElement
 public class ChargingProfile implements Validatable {
     private Integer chargingProfileId;
     private Integer transactionId;
@@ -55,6 +58,7 @@ public boolean validate() {
         return valid;
     }
 
+    @XmlElement
     public void setChargingProfileId(Integer chargingProfileId) throws PropertyConstraintException {
         if (chargingProfileId == null)
             throw new PropertyConstraintException("chargingProfileId", chargingProfileId);
@@ -66,6 +70,7 @@ public Integer getChargingProfileId() {
         return chargingProfileId;
     }
 
+    @XmlElement
     public void setTransactionId(Integer transactionId) {
         this.transactionId = transactionId;
     }
@@ -74,6 +79,7 @@ public Integer getTransactionId() {
         return transactionId;
     }
 
+    @XmlElement
     public void setStackLevel(Integer stackLevel) throws PropertyConstraintException {
         if (stackLevel < 0)
             throw new PropertyConstraintException("stackLevel", stackLevel);
@@ -85,6 +91,7 @@ public Integer getStackLevel() {
         return stackLevel;
     }
 
+    @XmlElement
     public void setChargingProfilePurpose(ChargingProfilePurposeType chargingProfilePurpose) throws PropertyConstraintException {
         this.chargingProfilePurpose = chargingProfilePurpose;
     }
@@ -97,6 +104,7 @@ public ChargingProfilePurposeType objChargingProfilePurpose() {
         return chargingProfilePurpose;
     }
 
+    @XmlElement
     public void setChargingProfileKind(ChargingProfileKindType chargingProfileKind) throws PropertyConstraintException {
         this.chargingProfileKind = chargingProfileKind;
     }
@@ -109,6 +117,7 @@ public ChargingProfileKindType objChargingProfileKind() {
         return chargingProfileKind;
     }
 
+    @XmlElement
     public void setRecurrencyKind(RecurrencyKindType recurrencyKind) throws PropertyConstraintException {
         this.recurrencyKind = recurrencyKind;
     }
@@ -121,6 +130,7 @@ public RecurrencyKindType objRecurrencyKind() {
         return recurrencyKind;
     }
 
+    @XmlElement
     public void setValidFrom(Calendar validFrom) {
         this.validFrom = validFrom;
     }
@@ -135,6 +145,7 @@ public Calendar objValidFrom() {
         return this.validFrom;
     }
 
+    @XmlElement
     public void setValidTo(Calendar validTo) {
         this.validTo = validTo;
     }
@@ -149,6 +160,7 @@ public Calendar objValidTo() {
         return validTo;
     }
 
+    @XmlElement
     public void setChargingSchedule(ChargingSchedule chargingSchedule) {
         this.chargingSchedule = chargingSchedule;
     }

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/ChargingSchedule.java

@@ -2,6 +2,8 @@
 
 import eu.chargetime.ocpp.model.Validatable;
 
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
 import java.text.SimpleDateFormat;
 import java.util.Calendar;
 import java.util.TimeZone;
@@ -35,6 +37,7 @@
 /**
  * Class type used with {@link ChargingProfile}
  */
+@XmlRootElement
 public class ChargingSchedule implements Validatable {
     private Integer duration;
     private Calendar startSchedule;
@@ -69,6 +72,7 @@ public Integer getDuration() {
      *
      * @param duration integer, duration in seconds.
      */
+    @XmlElement
     public void setDuration(Integer duration) {
         this.duration = duration;
     }
@@ -99,6 +103,7 @@ public Calendar objStartSchedule() {
      *
      * @param startSchedule Calendar, start time.
      */
+    @XmlElement
     public void setStartSchedule(Calendar startSchedule) {
         this.startSchedule = startSchedule;
     }
@@ -126,6 +131,7 @@ public ChargingRateUnitType objChargingRateUnit() {
      *
      * @param chargingRateUnit    the {@link ChargingRateUnitType}.
      */
+    @XmlElement
     public void setChargingRateUnit(ChargingRateUnitType chargingRateUnit) {
         this.chargingRateUnit = chargingRateUnit;
     }
@@ -144,6 +150,7 @@ public ChargingSchedulePeriod[] getChargingSchedulePeriod() {
      *
      * @param chargingSchedulePeriod    array of {@link ChargingSchedulePeriod}.
      */
+    @XmlElement
     public void setChargingSchedulePeriod(ChargingSchedulePeriod[] chargingSchedulePeriod) {
         this.chargingSchedulePeriod = chargingSchedulePeriod;
     }
@@ -167,6 +174,7 @@ public Double getMinChargingRate() {
      *
      * @param minChargingRate decimal, min charge rate.
      */
+    @XmlElement
     public void setMinChargingRate(Double minChargingRate) {
         this.minChargingRate = minChargingRate;
     }

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/ChargingSchedulePeriod.java

@@ -28,9 +28,13 @@
 
 import eu.chargetime.ocpp.model.Validatable;
 
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlRootElement;
+
 /**
  * Class Type used with {@link ChargingSchedule}.
  */
+@XmlRootElement
 public class ChargingSchedulePeriod implements Validatable {
     private Integer startPeriod;
     private Double limit;
@@ -50,6 +54,7 @@ public boolean validate() {
      *
      * @param startPeriod integer, seconds from start of schedule.
      */
+    @XmlElement
     public void setStartPeriod(Integer startPeriod) {
         this.startPeriod = startPeriod;
     }
@@ -70,6 +75,7 @@ public Integer getStartPeriod() {
      *
      * @param limit decimal, power limit.
      */
+    @XmlElement
     public void setLimit(Double limit) {
         this.limit = limit;
     }
@@ -90,6 +96,7 @@ public Double getLimit() {
      *
      * @param numberPhases integer, default is 3.
      */
+    @XmlElement
     public void setNumberPhases(Integer numberPhases) {
         this.numberPhases = numberPhases;
     }