Merge pull request #201 from ubitricity/master

Allow listVersion 0 in SendLocalListRequest

Author: TVolden

build.gradle

@@ -15,7 +15,7 @@ buildscript {
 
 allprojects {
     group = 'eu.chargetime.ocpp'
-    version = '1.0.2'
+    version = '1.1'
 }
 
 subprojects {

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/localauthlist/SendLocalListRequest.java

@@ -74,8 +74,8 @@ public Integer getListVersion() {
    * @param listVersion, the version number of the list
    */
   public void setListVersion(Integer listVersion) {
-    if (listVersion < 1) {
-      throw new PropertyConstraintException(listVersion, "listVersion must be > 0");
+    if (listVersion < 0) {
+      throw new PropertyConstraintException(listVersion, "listVersion must be >= 0");
     }
     this.listVersion = listVersion;
   }
@@ -122,7 +122,7 @@ public void setUpdateType(UpdateType updateType) {
 
   @Override
   public boolean validate() {
-    boolean valid = listVersion != null && (listVersion >= 1) && (updateType != null);
+    boolean valid = listVersion != null && (listVersion >= 0) && (updateType != null);
 
     if (localAuthorizationList != null) {
       for (AuthorizationData data : localAuthorizationList) {

ocpp-v1_6/src/test/java/eu/chargetime/ocpp/model/localauthlist/test/SendLocalListRequestTest.java

@@ -38,28 +38,23 @@ public void setUp() {
 
   @Test
   public void setListVersion_asNegative_throwsPropertyConstraintException() {
-    testInvalidListVersion(-20);
-  }
-
-  @Test
-  public void setListVersion_asZero_throwsPropertyConstraintException() {
-    testInvalidListVersion(0);
+    testInvalidListVersion(-1);
   }
 
   private void testInvalidListVersion(int invalidVersion) {
     thrownException.expect(instanceOf(PropertyConstraintException.class));
     thrownException.expectMessage(
         equalTo(
-            "Validation failed: [listVersion must be > 0]. Current Value: ["
+            "Validation failed: [listVersion must be >= 0]. Current Value: ["
                 + invalidVersion
                 + "]"));
 
     request.setListVersion(invalidVersion);
   }
 
   @Test
-  public void setListVersion_isNonZeroPostive_isCorrect() {
-    for (int i = 1; i <= 10; i++) {
+  public void setListVersion_isNotNegative_isCorrect() {
+    for (int i = 0; i <= 10; i++) {
       // When
       request.setListVersion(i);
       // Then