Cleaning up unnecessary throws of PropertyConstraintException.

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

@@ -1,10 +1,44 @@
 package eu.chargetime.ocpp.feature.profile;
 
-import eu.chargetime.ocpp.PropertyConstraintException;
-import eu.chargetime.ocpp.feature.*;
+import eu.chargetime.ocpp.feature.AuthorizeFeature;
+import eu.chargetime.ocpp.feature.BootNotificationFeature;
+import eu.chargetime.ocpp.feature.ChangeAvailabilityFeature;
+import eu.chargetime.ocpp.feature.ChangeConfigurationFeature;
+import eu.chargetime.ocpp.feature.ClearCacheFeature;
+import eu.chargetime.ocpp.feature.DataTransferFeature;
+import eu.chargetime.ocpp.feature.Feature;
+import eu.chargetime.ocpp.feature.GetConfigurationFeature;
+import eu.chargetime.ocpp.feature.HeartbeatFeature;
+import eu.chargetime.ocpp.feature.MeterValuesFeature;
+import eu.chargetime.ocpp.feature.RemoteStartTransactionFeature;
+import eu.chargetime.ocpp.feature.RemoteStopTransactionFeature;
+import eu.chargetime.ocpp.feature.ResetFeature;
+import eu.chargetime.ocpp.feature.StartTransactionFeature;
+import eu.chargetime.ocpp.feature.StatusNotificationFeature;
+import eu.chargetime.ocpp.feature.StopTransactionFeature;
+import eu.chargetime.ocpp.feature.UnlockConnectorFeature;
 import eu.chargetime.ocpp.model.Confirmation;
 import eu.chargetime.ocpp.model.Request;
-import eu.chargetime.ocpp.model.core.*;
+import eu.chargetime.ocpp.model.core.AuthorizeRequest;
+import eu.chargetime.ocpp.model.core.BootNotificationRequest;
+import eu.chargetime.ocpp.model.core.ChangeAvailabilityRequest;
+import eu.chargetime.ocpp.model.core.ChangeConfigurationRequest;
+import eu.chargetime.ocpp.model.core.ChargePointErrorCode;
+import eu.chargetime.ocpp.model.core.ChargePointStatus;
+import eu.chargetime.ocpp.model.core.ClearCacheRequest;
+import eu.chargetime.ocpp.model.core.DataTransferRequest;
+import eu.chargetime.ocpp.model.core.GetConfigurationRequest;
+import eu.chargetime.ocpp.model.core.HeartbeatRequest;
+import eu.chargetime.ocpp.model.core.MeterValue;
+import eu.chargetime.ocpp.model.core.MeterValuesRequest;
+import eu.chargetime.ocpp.model.core.RemoteStartTransactionRequest;
+import eu.chargetime.ocpp.model.core.RemoteStopTransactionRequest;
+import eu.chargetime.ocpp.model.core.ResetRequest;
+import eu.chargetime.ocpp.model.core.SampledValue;
+import eu.chargetime.ocpp.model.core.StartTransactionRequest;
+import eu.chargetime.ocpp.model.core.StatusNotificationRequest;
+import eu.chargetime.ocpp.model.core.StopTransactionRequest;
+import eu.chargetime.ocpp.model.core.UnlockConnectorRequest;
 
 import java.util.ArrayList;
 import java.util.Calendar;
@@ -42,15 +76,15 @@ of this software and associated documentation files (the "Software"), to deal
  * <p>
  * Contains methods to create outgoing client requests.
  */
-public class ClientCoreProfile implements Profile
-{
-    ClientCoreEventHandler eventHandler;
+public class ClientCoreProfile implements Profile {
+
+    private ClientCoreEventHandler eventHandler;
     ArrayList<Feature> features;
 
     /**
      * Set up handler for client core feature requests.
-
-     * @param handler   call back methods for client events
+     *
+     * @param handler call back methods for client events
      */
     public ClientCoreProfile(ClientCoreEventHandler handler) {
         features = new ArrayList<>();
@@ -77,21 +111,20 @@ public ClientCoreProfile(ClientCoreEventHandler handler) {
     /**
      * Create a client {@link AuthorizeRequest} with required values.
      *
-     * @param idToken   required identification token.
+     * @param idToken required identification token.
      * @return an instance of {@link AuthorizeRequest}.
-     * @throws PropertyConstraintException  cast if requires fields isn't filled out correctly.
      * @see AuthorizeRequest
      * @see AuthorizeFeature
      */
-    public AuthorizeRequest createAuthorizeRequest(String idToken) throws PropertyConstraintException {
+    public AuthorizeRequest createAuthorizeRequest(String idToken) {
         return new AuthorizeRequest(idToken);
     }
 
     /**
      * Create a client {@link BootNotificationRequest} with required values.
      *
-     * @param vendor    required. Vendor name.
-     * @param model     required. Charge box model.
+     * @param vendor required. Vendor name.
+     * @param model  required. Charge box model.
      * @return an instance of {@link BootNotificationRequest}
      * @see BootNotificationRequest
      * @see BootNotificationFeature
@@ -103,7 +136,7 @@ public BootNotificationRequest createBootNotificationRequest(String vendor, Stri
     /**
      * Create a client {@link DataTransferRequest} with required values.
      *
-     * @param vendorId  required. Vendor identification.
+     * @param vendorId required. Vendor identification.
      * @return an instance of {@link DataTransferRequest}.
      * @see DataTransferRequest
      * @see DataTransferFeature
@@ -126,15 +159,14 @@ public HeartbeatRequest createHeartbeatRequest() {
     /**
      * Create a client {@link MeterValuesRequest} with one {@link SampledValue} and one {@link MeterValue}
      *
-     * @param connectorId   required. Identification of connector.
-     * @param timestamp     required. Time of sample.
-     * @param value         required. Value of sample.
+     * @param connectorId required. Identification of connector.
+     * @param timestamp   required. Time of sample.
+     * @param value       required. Value of sample.
      * @return an instance of {@link MeterValuesRequest}.
-     * @throws PropertyConstraintException  thrown if a required field isn't filled out correctly.
      * @see MeterValuesRequest
      * @see MeterValuesFeature
      */
-    public MeterValuesRequest createMeterValuesRequest(Integer connectorId, Calendar timestamp, String value) throws PropertyConstraintException {
+    public MeterValuesRequest createMeterValuesRequest(Integer connectorId, Calendar timestamp, String value) {
         SampledValue sampledValue = new SampledValue();
         sampledValue.setValue(value);
         return createMeterValuesRequest(connectorId, timestamp, sampledValue);
@@ -147,11 +179,10 @@ public MeterValuesRequest createMeterValuesRequest(Integer connectorId, Calendar
      * @param timestamp     required. Time of sample.
      * @param sampledValues required. Params list of {@link SampledValue}s
      * @return an instance of {@link MeterValuesRequest}
-     * @throws PropertyConstraintException  thrown if a required field isn't filled out correctly.
      * @see MeterValuesRequest
      * @see MeterValuesFeature
      */
-    public MeterValuesRequest createMeterValuesRequest(Integer connectorId, Calendar timestamp, SampledValue... sampledValues) throws PropertyConstraintException {
+    public MeterValuesRequest createMeterValuesRequest(Integer connectorId, Calendar timestamp, SampledValue... sampledValues) {
         MeterValue meterValue = new MeterValue();
         meterValue.setTimestamp(timestamp);
         meterValue.setSampledValue(sampledValues);
@@ -161,14 +192,13 @@ public MeterValuesRequest createMeterValuesRequest(Integer connectorId, Calendar
     /**
      * Create a client {@link MeterValuesRequest} with some {@link MeterValue}s.
      *
-     * @param connectorId   required. Identification of connector.
-     * @param meterValues   required. Params list of {@link MeterValue}s
+     * @param connectorId required. Identification of connector.
+     * @param meterValues required. Params list of {@link MeterValue}s
      * @return an instance of {@link MeterValuesRequest}
-     * @throws PropertyConstraintException  thrown if a required field isn't filled out correctly.
      * @see MeterValuesRequest
      * @see MeterValuesFeature
      */
-    public MeterValuesRequest createMeterValuesRequest(Integer connectorId, MeterValue... meterValues) throws PropertyConstraintException {
+    public MeterValuesRequest createMeterValuesRequest(Integer connectorId, MeterValue... meterValues) {
         MeterValuesRequest request = new MeterValuesRequest();
         request.setConnectorId(connectorId);
         request.setMeterValue(meterValues);
@@ -178,16 +208,15 @@ public MeterValuesRequest createMeterValuesRequest(Integer connectorId, MeterVal
     /**
      * Create a client {@link StartTransactionRequest} with required values.
      *
-     * @param connectorId   required. Identification of the connector.
-     * @param idTag         required. Authorization identification tag.
-     * @param meterStart    required. The initial value of the meter.
-     * @param timestamp     required. Time of start.
+     * @param connectorId required. Identification of the connector.
+     * @param idTag       required. Authorization identification tag.
+     * @param meterStart  required. The initial value of the meter.
+     * @param timestamp   required. Time of start.
      * @return an instance of {@link StartTransactionRequest}.
-     * @throws PropertyConstraintException thrown if a required field isn't filled out correctly.
      * @see StartTransactionRequest
      * @see StartTransactionFeature
      */
-    public StartTransactionRequest createStartTransactionRequest(Integer connectorId, String idTag, Integer meterStart, Calendar timestamp) throws PropertyConstraintException {
+    public StartTransactionRequest createStartTransactionRequest(Integer connectorId, String idTag, Integer meterStart, Calendar timestamp) {
         StartTransactionRequest request = new StartTransactionRequest();
         request.setConnectorId(connectorId);
         request.setIdTag(idTag);
@@ -199,15 +228,14 @@ public StartTransactionRequest createStartTransactionRequest(Integer connectorId
     /**
      * Create a client {@link StatusNotificationRequest} with required values.
      *
-     * @param connectorId   required. Identification of the connector.
-     * @param errorCode     required. {@link ChargePointErrorCode} of the connector.
-     * @param status        required. {@link ChargePointStatus} of the connector.
+     * @param connectorId required. Identification of the connector.
+     * @param errorCode   required. {@link ChargePointErrorCode} of the connector.
+     * @param status      required. {@link ChargePointStatus} of the connector.
      * @return an instance of {@link StatusNotificationRequest}.
-     * @throws PropertyConstraintException thrown if a required field isn't filled out correctly.
      * @see StatusNotificationRequest
      * @see StatusNotificationFeature
      */
-    public StatusNotificationRequest createStatusNotificationRequest(Integer connectorId, ChargePointErrorCode errorCode, ChargePointStatus status) throws PropertyConstraintException {
+    public StatusNotificationRequest createStatusNotificationRequest(Integer connectorId, ChargePointErrorCode errorCode, ChargePointStatus status) {
         StatusNotificationRequest request = new StatusNotificationRequest();
         request.setConnectorId(connectorId);
         request.setErrorCode(errorCode);
@@ -218,9 +246,9 @@ public StatusNotificationRequest createStatusNotificationRequest(Integer connect
     /**
      * Create a client {@link StopTransactionRequest} with required values.
      *
-     * @param meterStop        required. The final value of the meter.
-     * @param timestamp        required. Time of stop.
-     * @param transactionId    required. The identification of the transaction.
+     * @param meterStop     required. The final value of the meter.
+     * @param timestamp     required. Time of stop.
+     * @param transactionId required. The identification of the transaction.
      * @return an instance of {@link StopTransactionRequest}.
      */
     public StopTransactionRequest createStopTransactionRequest(int meterStop, Calendar timestamp, int transactionId) {
@@ -249,7 +277,7 @@ public Confirmation handleRequest(UUID sessionIndex, Request request) {
         } else if (request instanceof ClearCacheRequest) {
             result = eventHandler.handleClearCacheRequest((ClearCacheRequest) request);
         } else if (request instanceof DataTransferRequest) {
-            result = eventHandler.handleDataTransferRequest((DataTransferRequest)request);
+            result = eventHandler.handleDataTransferRequest((DataTransferRequest) request);
         } else if (request instanceof RemoteStartTransactionRequest) {
             result = eventHandler.handleRemoteStartTransactionRequest((RemoteStartTransactionRequest) request);
         } else if (request instanceof RemoteStopTransactionRequest) {

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

@@ -1,6 +1,6 @@
 package eu.chargetime.ocpp.feature.profile;/*
     ChargeTime.eu - Java-OCA-OCPP
-    
+
     MIT License
 
     Copyright (C) 2016-2018 Thomas Volden <tv@chargetime.eu>
@@ -24,11 +24,43 @@ of this software and associated documentation files (the "Software"), to deal
     SOFTWARE.
  */
 
-import eu.chargetime.ocpp.PropertyConstraintException;
-import eu.chargetime.ocpp.feature.*;
+import eu.chargetime.ocpp.feature.AuthorizeFeature;
+import eu.chargetime.ocpp.feature.BootNotificationFeature;
+import eu.chargetime.ocpp.feature.ChangeAvailabilityFeature;
+import eu.chargetime.ocpp.feature.ChangeConfigurationFeature;
+import eu.chargetime.ocpp.feature.ClearCacheFeature;
+import eu.chargetime.ocpp.feature.DataTransferFeature;
+import eu.chargetime.ocpp.feature.Feature;
+import eu.chargetime.ocpp.feature.GetConfigurationFeature;
+import eu.chargetime.ocpp.feature.HeartbeatFeature;
+import eu.chargetime.ocpp.feature.MeterValuesFeature;
+import eu.chargetime.ocpp.feature.RemoteStartTransactionFeature;
+import eu.chargetime.ocpp.feature.RemoteStopTransactionFeature;
+import eu.chargetime.ocpp.feature.ResetFeature;
+import eu.chargetime.ocpp.feature.StartTransactionFeature;
+import eu.chargetime.ocpp.feature.StatusNotificationFeature;
+import eu.chargetime.ocpp.feature.StopTransactionFeature;
+import eu.chargetime.ocpp.feature.UnlockConnectorFeature;
 import eu.chargetime.ocpp.model.Confirmation;
 import eu.chargetime.ocpp.model.Request;
-import eu.chargetime.ocpp.model.core.*;
+import eu.chargetime.ocpp.model.core.AuthorizeRequest;
+import eu.chargetime.ocpp.model.core.AvailabilityType;
+import eu.chargetime.ocpp.model.core.BootNotificationRequest;
+import eu.chargetime.ocpp.model.core.ChangeAvailabilityRequest;
+import eu.chargetime.ocpp.model.core.ChangeConfigurationRequest;
+import eu.chargetime.ocpp.model.core.ClearCacheRequest;
+import eu.chargetime.ocpp.model.core.DataTransferRequest;
+import eu.chargetime.ocpp.model.core.GetConfigurationRequest;
+import eu.chargetime.ocpp.model.core.HeartbeatRequest;
+import eu.chargetime.ocpp.model.core.MeterValuesRequest;
+import eu.chargetime.ocpp.model.core.RemoteStartTransactionRequest;
+import eu.chargetime.ocpp.model.core.RemoteStopTransactionRequest;
+import eu.chargetime.ocpp.model.core.ResetRequest;
+import eu.chargetime.ocpp.model.core.ResetType;
+import eu.chargetime.ocpp.model.core.StartTransactionRequest;
+import eu.chargetime.ocpp.model.core.StatusNotificationRequest;
+import eu.chargetime.ocpp.model.core.StopTransactionRequest;
+import eu.chargetime.ocpp.model.core.UnlockConnectorRequest;
 
 import java.util.HashSet;
 import java.util.UUID;
@@ -90,14 +122,14 @@ public Confirmation handleRequest(UUID sessionIndex, Request request) {
         return result;
     }
 
-    public ChangeAvailabilityRequest createChangeAvailabilityRequest(AvailabilityType type, int connectorId) throws PropertyConstraintException {
+    public ChangeAvailabilityRequest createChangeAvailabilityRequest(AvailabilityType type, int connectorId) {
         ChangeAvailabilityRequest request = new ChangeAvailabilityRequest();
         request.setType(type);
         request.setConnectorId(connectorId);
         return request;
     }
 
-    public ChangeConfigurationRequest createChangeConfigurationRequest(String key, String value) throws PropertyConstraintException {
+    public ChangeConfigurationRequest createChangeConfigurationRequest(String key, String value) {
         ChangeConfigurationRequest request = new ChangeConfigurationRequest();
         request.setKey(key);
         request.setValue(value);
@@ -108,7 +140,7 @@ public ClearCacheRequest createClearCacheRequest() {
         return new ClearCacheRequest();
     }
 
-    public DataTransferRequest createDataTransferRequest(String vendorId) throws PropertyConstraintException {
+    public DataTransferRequest createDataTransferRequest(String vendorId) {
         DataTransferRequest request = new DataTransferRequest();
         request.setVendorId(vendorId);
         return request;
@@ -118,7 +150,7 @@ public GetConfigurationRequest createGetConfigurationRequest() {
         return new GetConfigurationRequest();
     }
 
-    public RemoteStartTransactionRequest createRemoteStartTransactionRequest(String idToken) throws PropertyConstraintException {
+    public RemoteStartTransactionRequest createRemoteStartTransactionRequest(String idToken) {
         RemoteStartTransactionRequest request = new RemoteStartTransactionRequest();
         request.setIdTag(idToken);
         return request;
@@ -136,7 +168,7 @@ public ResetRequest createResetRequest(ResetType type) {
         return request;
     }
 
-    public UnlockConnectorRequest createUnlockConnectorRequest(int connectorId) throws PropertyConstraintException {
+    public UnlockConnectorRequest createUnlockConnectorRequest(int connectorId) {
         UnlockConnectorRequest request = new UnlockConnectorRequest();
         request.setConnectorId(connectorId);
         return request;

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

@@ -1,6 +1,5 @@
 package eu.chargetime.ocpp.feature.profile;
 
-import eu.chargetime.ocpp.PropertyConstraintException;
 import eu.chargetime.ocpp.feature.Feature;
 import eu.chargetime.ocpp.feature.TriggerMessageFeature;
 import eu.chargetime.ocpp.model.Confirmation;
@@ -58,13 +57,13 @@ public Confirmation handleRequest(UUID sessionIndex, Request request) {
         return null;
     }
 
-    public TriggerMessageRequest createTriggerMessageRequest(TriggerMessageRequestType type) throws PropertyConstraintException {
+    public TriggerMessageRequest createTriggerMessageRequest(TriggerMessageRequestType type) {
         return createTriggerMessageRequest(type, null);
     }
 
-    public TriggerMessageRequest createTriggerMessageRequest(TriggerMessageRequestType type, Integer connectorId) throws PropertyConstraintException {
+    public TriggerMessageRequest createTriggerMessageRequest(TriggerMessageRequestType type, Integer connectorId) {
         TriggerMessageRequest request = new TriggerMessageRequest(type);
         request.setConnectorId(connectorId);
         return request;
     }
-}
+}

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

@@ -1,6 +1,5 @@
 package eu.chargetime.ocpp.feature.profile;
 
-import eu.chargetime.ocpp.PropertyConstraintException;
 import eu.chargetime.ocpp.feature.Feature;
 import eu.chargetime.ocpp.feature.SetChargingProfileFeature;
 import eu.chargetime.ocpp.model.Confirmation;
@@ -53,10 +52,10 @@ public Feature[] getFeatureList() {
 
     @Override
     public Confirmation handleRequest(UUID sessionIndex, Request request) {
-       return null;
+        return null;
     }
 
-    public SetChargingProfileRequest createSetChargingProfileRequest(int connectorId, ChargingProfile profile) throws PropertyConstraintException {
+    public SetChargingProfileRequest createSetChargingProfileRequest(int connectorId, ChargingProfile profile) {
         SetChargingProfileRequest request = new SetChargingProfileRequest();
         request.setConnectorId(connectorId);
         request.setChargingProfile(profile);