From 5268927b7a509e58684fe83c29b9c4809d4a62ba Mon Sep 17 00:00:00 2001 From: Spyridon Papadopoulos Date: Mon, 18 Jun 2018 00:50:38 +0200 Subject: [PATCH] Cleaning up unnecessary throws of PropertyConstraintException. --- .../feature/profile/ClientCoreProfile.java | 108 +++++++++++------- .../feature/profile/ServerCoreProfile.java | 50 ++++++-- .../profile/ServerRemoteTriggerProfile.java | 7 +- .../profile/ServerSmartChargingProfile.java | 5 +- .../ocpp/model/core/SampledValue.java | 3 - .../remotetrigger/TriggerMessageRequest.java | 7 +- .../profile/test/ClientCoreProfileTest.java | 62 ++++++++-- .../profile/test/ServerCoreProfileTest.java | 59 +++++++--- .../test/ServerRemoteTriggerProfileTest.java | 4 +- .../test/ServerSmartChargingProfileTest.java | 13 ++- ...FirmwareStatusNotificationRequestTest.java | 2 +- 11 files changed, 227 insertions(+), 93 deletions(-) diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/feature/profile/ClientCoreProfile.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/feature/profile/ClientCoreProfile.java index 1da001e85..4ee5de4ba 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/feature/profile/ClientCoreProfile.java +++ b/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 *

* Contains methods to create outgoing client requests. */ -public class ClientCoreProfile implements Profile -{ - ClientCoreEventHandler eventHandler; +public class ClientCoreProfile implements Profile { + + private ClientCoreEventHandler eventHandler; ArrayList 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) { diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/feature/profile/ServerCoreProfile.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/feature/profile/ServerCoreProfile.java index 77a903de5..726b988c9 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/feature/profile/ServerCoreProfile.java +++ b/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 @@ -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; diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/feature/profile/ServerRemoteTriggerProfile.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/feature/profile/ServerRemoteTriggerProfile.java index 571e30245..aaa886c8a 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/feature/profile/ServerRemoteTriggerProfile.java +++ b/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; } -} \ No newline at end of file +} diff --git a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/feature/profile/ServerSmartChargingProfile.java b/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/feature/profile/ServerSmartChargingProfile.java index b0ecbf3a1..f48292faa 100644 --- a/ocpp-v1_6/src/main/java/eu/chargetime/ocpp/feature/profile/ServerSmartChargingProfile.java +++ b/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); 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 d702cc829..3d01f7020 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 @@ -199,7 +199,6 @@ public String getMeasurand() { * {@code Voltage} * * @param measurand String, enum value of measurand. - * @throws PropertyConstraintException Value wasn't accepted. */ // TODO: Change to enum, solve format issue and change exception message. @XmlElement @@ -244,7 +243,6 @@ public String getPhase() { * {@code L3-L1} * * @param phase String, enum value of phase. - * @throws PropertyConstraintException Value wasn't accepted. */ // TODO: Change to enum, solve format issue and change exception message. @XmlElement @@ -322,7 +320,6 @@ public String getUnit() { * {@code Percent} * * @param unit String, enum value, Unit of Measure. - * @throws PropertyConstraintException Value wasn't accepted. */ // TODO: Change to enum, solve format issue and change exception message. @XmlElement 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 b7b3dd145..5992d5d65 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 @@ -63,8 +63,8 @@ public Integer getConnectorId() { * @param connectorId integer. value > 0 */ @XmlElement - public void setConnectorId(int connectorId) { - if (connectorId <= 0) { + public void setConnectorId(Integer connectorId) { + if (connectorId != null && connectorId <= 0) { throw new PropertyConstraintException(connectorId, "connectorId must be > 0"); } @@ -85,7 +85,6 @@ public void setRequestedMessage(TriggerMessageRequestType requestedMessage) { this.requestedMessage = requestedMessage; } - /** * This identifies which type of message you want to trigger. * @@ -99,7 +98,7 @@ public boolean transactionRelated() { @Override public boolean validate() { boolean valid = requestedMessage != null; - valid &= (connectorId != null && connectorId > 0); + valid &= (connectorId == null || connectorId > 0); return valid; } diff --git a/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ClientCoreProfileTest.java b/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ClientCoreProfileTest.java index 06a170fd4..73114cbe1 100644 --- a/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ClientCoreProfileTest.java +++ b/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ClientCoreProfileTest.java @@ -1,11 +1,49 @@ package eu.chargetime.ocpp.feature.profile.test; -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.feature.profile.ClientCoreEventHandler; import eu.chargetime.ocpp.feature.profile.ClientCoreProfile; 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.ChangeAvailabilityConfirmation; +import eu.chargetime.ocpp.model.core.ChangeAvailabilityRequest; +import eu.chargetime.ocpp.model.core.ChangeConfigurationConfirmation; +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.ClearCacheConfirmation; +import eu.chargetime.ocpp.model.core.ClearCacheRequest; +import eu.chargetime.ocpp.model.core.DataTransferConfirmation; +import eu.chargetime.ocpp.model.core.DataTransferRequest; +import eu.chargetime.ocpp.model.core.GetConfigurationConfirmation; +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.StartTransactionRequest; +import eu.chargetime.ocpp.model.core.StatusNotificationRequest; +import eu.chargetime.ocpp.model.core.StopTransactionRequest; +import eu.chargetime.ocpp.model.core.UnlockConnectorRequest; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -18,7 +56,11 @@ import static org.hamcrest.CoreMatchers.instanceOf; import static org.hamcrest.CoreMatchers.is; import static org.junit.Assert.assertThat; -import static org.mockito.Mockito.*; +import static org.mockito.Mockito.any; +import static org.mockito.Mockito.eq; +import static org.mockito.Mockito.times; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; /* ChargeTime.eu - Java-OCA-OCPP @@ -53,7 +95,7 @@ public class ClientCoreProfileTest extends ProfileTest { private ClientCoreProfile core; @Mock - ClientCoreEventHandler handler; + private ClientCoreEventHandler handler; @Before public void setup() { @@ -61,7 +103,7 @@ public void setup() { } @Test - public void createAuthorizeRequest_withIdToken_returnsAuthorizeRequestWithIdTag() throws Exception { + public void createAuthorizeRequest_withIdToken_returnsAuthorizeRequestWithIdTag() { // Given String legalIdToken = "test123"; @@ -96,7 +138,7 @@ public void createHeartbeatRequest_returnsHeartbeatRequest() { } @Test - public void createMeterValuesRequest_returnsMeterValuesRequest() throws Exception { + public void createMeterValuesRequest_returnsMeterValuesRequest() { // When Request result = core.createMeterValuesRequest(42, Calendar.getInstance(), "42"); @@ -105,7 +147,7 @@ public void createMeterValuesRequest_returnsMeterValuesRequest() throws Exceptio } @Test - public void createStartTransactionRequest_returnsStartTransactionRequest() throws Exception { + public void createStartTransactionRequest_returnsStartTransactionRequest() { // When Request result = core.createStartTransactionRequest(42, "some token", 42, Calendar.getInstance()); @@ -114,7 +156,7 @@ public void createStartTransactionRequest_returnsStartTransactionRequest() throw } @Test - public void createStatusNotificationRequest_returnsStatusNotificationRequest() throws Exception { + public void createStatusNotificationRequest_returnsStatusNotificationRequest() { // When Request result = core.createStatusNotificationRequest(42, ChargePointErrorCode.NoError, ChargePointStatus.Available); @@ -123,7 +165,7 @@ public void createStatusNotificationRequest_returnsStatusNotificationRequest() t } @Test - public void createStopTransactionRequest_returnsStopTransactionRequest() throws Exception { + public void createStopTransactionRequest_returnsStopTransactionRequest() { // When Request result = core.createStopTransactionRequest(42, Calendar.getInstance(), 42); @@ -450,4 +492,4 @@ public void getFeatureList_containsDataTransfer() { assertThat(findFeature(features, "DataTransfer"), is(instanceOf(DataTransferFeature.class))); } -} \ No newline at end of file +} diff --git a/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ServerCoreProfileTest.java b/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ServerCoreProfileTest.java index 6187adeeb..d38b4775c 100644 --- a/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ServerCoreProfileTest.java +++ b/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ServerCoreProfileTest.java @@ -1,9 +1,42 @@ package eu.chargetime.ocpp.feature.profile.test; -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.feature.profile.ServerCoreEventHandler; import eu.chargetime.ocpp.feature.profile.ServerCoreProfile; -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 org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -21,7 +54,7 @@ /* ChargeTime.eu - Java-OCA-OCPP - + MIT License Copyright (C) 2016-2018 Thomas Volden @@ -112,7 +145,7 @@ public void getFeatureList_containsChangeAvailabilityFeature() { } @Test - public void createChangeAvailabilityRequest_withTypeAndConnectorId_returnsValidChangeAvailabilityRequest() throws Exception { + public void createChangeAvailabilityRequest_withTypeAndConnectorId_returnsValidChangeAvailabilityRequest() { // Given AvailabilityType type = AvailabilityType.Operative; int connectorId = 1; @@ -134,7 +167,7 @@ public void getFeatureList_containsChangeConfigurationFeature() { } @Test - public void createChangeConfigurationRequest_withKeyAndValue_returnsValidChangeConfigurationRequest() throws Exception { + public void createChangeConfigurationRequest_withKeyAndValue_returnsValidChangeConfigurationRequest() { // Given String key = "some key"; String value = "some value"; @@ -156,7 +189,7 @@ public void getFeatureList_containsClearCacheFeature() { } @Test - public void createClearCacheRequest_returnsValidClearCacheRequest() throws Exception { + public void createClearCacheRequest_returnsValidClearCacheRequest() { // When ClearCacheRequest result = core.createClearCacheRequest(); @@ -174,7 +207,7 @@ public void getFeatureList_containsDataTransferFeature() { } @Test - public void createChangeConfigurationRequest_withVendorId_returnsValidDataTransferRequest() throws Exception { + public void createChangeConfigurationRequest_withVendorId_returnsValidDataTransferRequest() { // Given String vendorId = "some vendorId"; @@ -208,7 +241,7 @@ public void getFeatureList_containsGetConfigurationFeature() { } @Test - public void createGetConfigurationRequest_returnsValidGetConfigurationRequest() throws Exception { + public void createGetConfigurationRequest_returnsValidGetConfigurationRequest() { // When GetConfigurationRequest result = core.createGetConfigurationRequest(); @@ -271,7 +304,7 @@ public void getFeatureList_containsRemoteStartTransactionFeature() { } @Test - public void createRemoteStartTransactionRequest_withIdToken_returnsValidRemoteStartTransactionRequest() throws Exception { + public void createRemoteStartTransactionRequest_withIdToken_returnsValidRemoteStartTransactionRequest() { // Given String idToken = "Some IdToken"; @@ -292,7 +325,7 @@ public void getFeatureList_containsRemoteStopTransactionFeature() { } @Test - public void createRemoteStopTransactionRequest_withTransactionId_returnsValidRemoteStopTransactionRequest() throws Exception { + public void createRemoteStopTransactionRequest_withTransactionId_returnsValidRemoteStopTransactionRequest() { // Given Integer transactionId = 42; @@ -313,7 +346,7 @@ public void getFeatureList_containsResetFeature() { } @Test - public void createResetRequest_withType_returnsValidResetRequest() throws Exception { + public void createResetRequest_withType_returnsValidResetRequest() { // Given ResetType type = ResetType.Hard; @@ -400,7 +433,7 @@ public void getFeatureList_containsUnlockConnectorFeature() { } @Test - public void createUnlockConnectorRequest_withConnectorId_returnsValidUnlockConnectorRequest() throws Exception { + public void createUnlockConnectorRequest_withConnectorId_returnsValidUnlockConnectorRequest() { // Given int connectorId = 42; @@ -411,4 +444,4 @@ public void createUnlockConnectorRequest_withConnectorId_returnsValidUnlockConne assertThat(result.validate(), is(true)); } -} \ No newline at end of file +} diff --git a/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ServerRemoteTriggerProfileTest.java b/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ServerRemoteTriggerProfileTest.java index c6b4133d9..3eb62e03f 100644 --- a/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ServerRemoteTriggerProfileTest.java +++ b/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ServerRemoteTriggerProfileTest.java @@ -60,7 +60,7 @@ public void getFeatureList_containsTriggerMessageFeature() { } @Test - public void createTriggerMessageRequest_returnsValidTriggerMessageRequest() throws Exception { + public void createTriggerMessageRequest_returnsValidTriggerMessageRequest() { TriggerMessageRequestType type = TriggerMessageRequestType.DiagnosticsStatusNotification; int connectorId = 1; @@ -78,7 +78,7 @@ public void createTriggerMessageRequest_returnsValidTriggerMessageRequest() thro } @Test - public void createTriggerMessageRequest_returnsValidTriggerMessageRequestNoConnectorId() throws Exception { + public void createTriggerMessageRequest_returnsValidTriggerMessageRequestNoConnectorId() { TriggerMessageRequestType type = TriggerMessageRequestType.DiagnosticsStatusNotification; // When diff --git a/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ServerSmartChargingProfileTest.java b/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ServerSmartChargingProfileTest.java index 3ac2f01bf..951a7db6b 100644 --- a/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ServerSmartChargingProfileTest.java +++ b/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/feature/profile/test/ServerSmartChargingProfileTest.java @@ -3,7 +3,12 @@ import eu.chargetime.ocpp.feature.Feature; import eu.chargetime.ocpp.feature.SetChargingProfileFeature; import eu.chargetime.ocpp.feature.profile.ServerSmartChargingProfile; -import eu.chargetime.ocpp.model.core.*; +import eu.chargetime.ocpp.model.core.ChargingProfile; +import eu.chargetime.ocpp.model.core.ChargingProfileKindType; +import eu.chargetime.ocpp.model.core.ChargingProfilePurposeType; +import eu.chargetime.ocpp.model.core.ChargingRateUnitType; +import eu.chargetime.ocpp.model.core.ChargingSchedule; +import eu.chargetime.ocpp.model.core.ChargingSchedulePeriod; import eu.chargetime.ocpp.model.smartcharging.SetChargingProfileRequest; import org.junit.Before; import org.junit.Test; @@ -60,7 +65,7 @@ public void getFeatureList_containsSetChargingProfileFeature() { } @Test - public void createSetChargingProfileRequest_returnsValidSetChargingProfileRequest() throws Exception { + public void createSetChargingProfileRequest_returnsValidSetChargingProfileRequest() { int connectorId = 123; @@ -78,11 +83,11 @@ public void createSetChargingProfileRequest_returnsValidSetChargingProfileReques period.setStartPeriod(0); period.setLimit(20.3); period.setNumberPhases(1); - schedule.setChargingSchedulePeriod(new ChargingSchedulePeriod[]{ period }); + schedule.setChargingSchedulePeriod(new ChargingSchedulePeriod[]{period}); profile.setChargingSchedule(schedule); // When - SetChargingProfileRequest result = smartCharging.createSetChargingProfileRequest(connectorId, profile); + SetChargingProfileRequest result = smartCharging.createSetChargingProfileRequest(connectorId, profile); // Then assertThat(result.validate(), is(true)); diff --git a/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/model/firmware/test/FirmwareStatusNotificationRequestTest.java b/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/model/firmware/test/FirmwareStatusNotificationRequestTest.java index 43a62b75c..bb813d29e 100644 --- a/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/model/firmware/test/FirmwareStatusNotificationRequestTest.java +++ b/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/model/firmware/test/FirmwareStatusNotificationRequestTest.java @@ -61,7 +61,7 @@ public void validate_statusIsNotSet_returnsFalse() { } @Test - public void validate_statusIsSet_returnsTrue() throws PropertyConstraintException { + public void validate_statusIsSet_returnsTrue() { // Given FirmwareStatus status = FirmwareStatus.Installing; request.setStatus(status);