Merge branch 'master' of https://github.com/ChangetimeEU/Java-OCA-OCPP

Author: TVolden

ocpp-v1_6-test/src/main/java/eu/chargetime/ocpp/test/FakeCentralSystem.java

@@ -310,9 +310,7 @@ public boolean hasHandledMeterValuesRequest() {
 
     public void sendRemoteStartTransactionRequest(int connectorId, String idTag) throws Exception {
         RemoteStartTransactionRequest request = new RemoteStartTransactionRequest();
-        IdToken idToken = new IdToken();
-        idToken.setIdToken(idTag);
-        request.setIdTag(idToken);
+        request.setIdTag(idTag);
         request.setConnectorId(connectorId);
         server.send(currentSessionIndex, request).whenComplete((confirmation, throwable) -> receivedConfirmation = confirmation);
     }

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/feature/profile/ClientCoreProfile.java

@@ -190,9 +190,7 @@ public MeterValuesRequest createMeterValuesRequest(Integer connectorId, MeterVal
     public StartTransactionRequest createStartTransactionRequest(Integer connectorId, String idTag, Integer meterStart, Calendar timestamp) throws PropertyConstraintException {
         StartTransactionRequest request = new StartTransactionRequest();
         request.setConnectorId(connectorId);
-        IdToken idToken = new IdToken();
-        idToken.setIdToken(idTag);
-        request.setIdTag(idToken);
+        request.setIdTag(idTag);
         request.setMeterStart(meterStart);
         request.setTimestamp(timestamp);
         return request;

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/feature/profile/ServerCoreProfile.java

@@ -119,11 +119,8 @@ public GetConfigurationRequest createGetConfigurationRequest() {
     }
 
     public RemoteStartTransactionRequest createRemoteStartTransactionRequest(String idToken) throws PropertyConstraintException {
-        IdToken idTag = new IdToken();
-        idTag.setIdToken(idToken);
-
         RemoteStartTransactionRequest request = new RemoteStartTransactionRequest();
-        request.setIdTag(idTag);
+        request.setIdTag(idToken);
         return request;
     }
 

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

@@ -44,7 +44,7 @@ of this software and associated documentation files (the "Software"), to deal
 public class IdTagInfo implements Validatable
 {
     private Calendar expiryDate;
-    private IdToken parentIdTag;
+    private String parentIdTag;
     private AuthorizationStatus status;
 
     /**
@@ -79,19 +79,19 @@ public void setExpiryDate(Calendar expiryDate) {
     /**
      * This contains the parent-identifier.
      *
-     * @return  the {@link IdToken} of the parent.
+     * @return  the IdToken of the parent.
      */
-    public IdToken getParentIdTag() {
+    public String getParentIdTag() {
         return parentIdTag;
     }
 
     /**
      * Optional. This contains the parent-identifier.
      *
-     * @param parentIdTag   an {@link IdToken}.
+     * @param parentIdTag   an IdToken.
      */
     @XmlElement
-    public void setParentIdTag(IdToken parentIdTag) {
+    public void setParentIdTag(String parentIdTag) {
         this.parentIdTag = parentIdTag;
     }
 

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

@@ -2,6 +2,7 @@
 
 import eu.chargetime.ocpp.PropertyConstraintException;
 import eu.chargetime.ocpp.model.Request;
+import eu.chargetime.ocpp.utilities.ModelUtil;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
@@ -39,14 +40,14 @@
 public class RemoteStartTransactionRequest implements Request {
 
     private Integer connectorId;
-    private IdToken idTag;
+    private String idTag;
     private ChargingProfile chargingProfile;
 
     @Override
     public boolean validate() {
         boolean valid = true;
         if (valid &= idTag != null)
-            valid &= idTag.validate();
+            valid &= ModelUtil.validate(idTag, 20);
 
         if (chargingProfile != null) {
             valid &= chargingProfile.validate();
@@ -83,19 +84,19 @@ public void setConnectorId(Integer connectorId) throws PropertyConstraintExcepti
     /**
      * The identifier that Charge Point must use to start a transaction.
      *
-     * @return an {@link IdToken}.
+     * @return an IdToken.
      */
-    public IdToken getIdTag() {
+    public String getIdTag() {
         return idTag;
     }
 
     /**
      * Required. The identifier that Charge Point must use to start a transaction.
      *
-     * @param idTag    an {@link IdToken}.
+     * @param idTag an IdToken
      */
     @XmlElement
-    public void setIdTag(IdToken idTag) {
+    public void setIdTag(String idTag) {
         this.idTag = idTag;
     }
 

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

@@ -2,6 +2,7 @@
 
 import eu.chargetime.ocpp.PropertyConstraintException;
 import eu.chargetime.ocpp.model.Request;
+import eu.chargetime.ocpp.utilities.ModelUtil;
 
 import javax.xml.bind.annotation.XmlElement;
 import javax.xml.bind.annotation.XmlRootElement;
@@ -39,7 +40,7 @@
 @XmlRootElement
 public class StartTransactionRequest implements Request {
     private Integer connectorId;
-    private IdToken idTag;
+    private String idTag;
     private Integer meterStart;
     private Integer reservationId;
     private Calendar timestamp;
@@ -49,7 +50,7 @@ public boolean validate() {
         boolean valid = true;
         valid &= connectorId != null && connectorId > 0;
         if (valid &= idTag != null)
-            valid &= idTag.validate();
+            valid &= ModelUtil.validate(idTag, 20);
         valid &= meterStart != null;
         valid &= timestamp != null;
         return valid;
@@ -81,19 +82,19 @@ public void setConnectorId(Integer connectorId) throws PropertyConstraintExcepti
     /**
      * This contains the identifier for which a transaction has to be started.
      *
-     * @return the {@link IdToken}.
+     * @return the IdToken.
      */
-    public IdToken getIdTag() {
+    public String getIdTag() {
         return idTag;
     }
 
     /**
      * Required. This contains the identifier for which a transaction has to be started.
      *
-     * @param idTag the {@link IdToken}.
+     * @param idTag the IdToken.
      */
     @XmlElement
-    public void setIdTag(IdToken idTag) {
+    public void setIdTag(String idTag) {
         this.idTag = idTag;
     }
 

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

@@ -37,7 +37,7 @@
  */
 @XmlRootElement
 public class StopTransactionRequest implements Request {
-    private IdToken idTag;
+    private String idTag;
     private Integer meterStop;
     private Calendar timestamp;
     private Integer transactionId;
@@ -61,9 +61,9 @@ public boolean validate() {
     /**
      * This contains the identifier which requested to stop the charging.
      *
-     * @return the {@link IdToken}.
+     * @return the IdToken.
      */
-    public IdToken getIdTag() {
+    public String getIdTag() {
         return idTag;
     }
 
@@ -72,10 +72,10 @@ public IdToken getIdTag() {
      * It is optional because a Charge Point may terminate charging without the presence of an idTag, e.g. in case of a reset.
      * A Charge Point SHALL send the idTag if known.
      *
-     * @param idTag the {@link IdToken}.
+     * @param idTag the IdToken.
      */
     @XmlElement
-    public void setIdTag(IdToken idTag) {
+    public void setIdTag(String idTag) {
         this.idTag = idTag;
     }