From c4ac8bfd3e0f60f97d9bcdb9a02583a0d9370596 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Ro=CC=88hr?= Date: Fri, 21 Sep 2018 16:09:43 +0200 Subject: [PATCH 1/2] fix wrong connectorId validation --- .../ocpp/model/smartcharging/SetChargingProfileRequest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 5a84d1af1..0cba3f150 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 @@ -65,8 +65,8 @@ public Integer getConnectorId() { */ @XmlElement public void setConnectorId(Integer connectorId) { - if (connectorId == null || connectorId <= 0) { - throw new PropertyConstraintException(connectorId, "connectorId must be > 0"); + if (connectorId == null || connectorId < 0) { + throw new PropertyConstraintException(connectorId, "connectorId must be >= 0"); } this.connectorId = connectorId; @@ -99,7 +99,7 @@ public boolean transactionRelated() { @Override public boolean validate() { - boolean valid = connectorId != null && connectorId > 0; + boolean valid = connectorId != null && connectorId >= 0; if (csChargingProfiles != null) { valid &= csChargingProfiles.validate(); From 88e4ee6899793bfcf23b8029ed13a3eb531a0ae4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Ro=CC=88hr?= Date: Mon, 24 Sep 2018 11:04:22 +0200 Subject: [PATCH 2/2] Fix unit tests and expected error message --- .../ocpp/model/test/SetChargingProfileRequestTest.java | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/model/test/SetChargingProfileRequestTest.java b/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/model/test/SetChargingProfileRequestTest.java index 8365ea684..2e8fda9e9 100644 --- a/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/model/test/SetChargingProfileRequestTest.java +++ b/ocpp-v1_6/src/test/java/eu/chargetime/ocpp/model/test/SetChargingProfileRequestTest.java @@ -39,7 +39,7 @@ public class SetChargingProfileRequestTest { - private static final String EXPECTED_ERROR_MESSAGE = "Validation failed: [connectorId must be > 0]. Current Value: [%s]"; + private static final String EXPECTED_ERROR_MESSAGE = "Validation failed: [connectorId must be >= 0]. Current Value: [%s]"; @Rule public ExpectedException thrownException = ExpectedException.none(); @@ -51,12 +51,6 @@ public void setUp() { request = new SetChargingProfileRequest(); } - - @Test - public void setConnectorId_zeroInteger_throwsPropertyConstraintException() { - testInvalidConnectorIdValue(0); - } - @Test public void setConnectorId_negativeInteger_throwsPropertyConstraintException() { testInvalidConnectorIdValue(-42);