0.5 cleanup spec added to json tests

ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/json/JSONAuthorizeSpec.groovy

@@ -27,6 +27,10 @@ class JSONAuthorizeSpec extends Specification {
         chargePoint.disconnect()
     }
 
+    def cleanupSpec() {
+        centralSystem.stopped()
+    }
+
     def "Charge point sends Authorize request and receives a response"() {
         def conditions = new PollingConditions(timeout: 1)
         when:

ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/json/JSONBootNotificationSpec.groovy

@@ -26,6 +26,10 @@ class JSONBootNotificationSpec extends Specification
     def cleanup() {
         chargePoint.disconnect()
     }
+
+    def cleanupSpec() {
+        centralSystem.stopped()
+    }
 
     def "Charge point sends Boot Notification and receives a response"() {
         def conditions = new PollingConditions(timeout: 1)

ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/json/JSONChangeAvailabilitySpec.groovy

@@ -28,6 +28,10 @@ class JSONChangeAvailabilitySpec extends Specification
         chargePoint.disconnect()
     }
 
+    def cleanupSpec() {
+        centralSystem.stopped()
+    }
+
     def "Central System sends a ChangeAvailability request and receives a response"() {
         def conditions = new PollingConditions(timeout: 1)
         when:

ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/json/JSONChangeConfigurationSpec.groovy

@@ -27,6 +27,10 @@ class JSONChangeConfigurationSpec extends Specification
         chargePoint.disconnect()
     }
 
+    def cleanupSpec() {
+        centralSystem.stopped()
+    }
+
     def "Central System sends a ChangeConfiguration request and receives a response"() {
         def conditions = new PollingConditions(timeout: 10)
         given:

ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/json/JSONClearCacheSpec.groovy

@@ -27,6 +27,10 @@ class JSONClearCacheSpec extends Specification
         chargePoint.disconnect()
     }
 
+    def cleanupSpec() {
+        centralSystem.stopped()
+    }
+
     def "Central System sends a ClearCache request and receives a response"() {
         def conditions = new PollingConditions(timeout: 1)
 

ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/json/JSONDataTransferSpec.groovy

@@ -27,6 +27,10 @@ class JSONDataTransferSpec extends Specification
         chargePoint.disconnect()
     }
 
+    def cleanupSpec() {
+        centralSystem.stopped()
+    }
+
     def "Central System sends a DataTransfer request and receives a response"() {
         def conditions = new PollingConditions(timeout: 1)
 

ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/json/JSONGetConfigurationSpec.groovy

@@ -27,6 +27,10 @@ class JSONGetConfigurationSpec extends Specification
         chargePoint.disconnect()
     }
 
+    def cleanupSpec() {
+        centralSystem.stopped()
+    }
+
     def "Central System sends a GetConfiguration request and receives a response"() {
         def conditions = new PollingConditions(timeout: 1)
 

ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/json/JSONHeartbeatSpec.groovy

@@ -27,6 +27,10 @@ class JSONHeartbeatSpec extends Specification
         chargePoint.disconnect()
     }
 
+    def cleanupSpec() {
+        centralSystem.stopped()
+    }
+
     def "Charge point sends Heartbeat and receives a response"() {
         def conditions = new PollingConditions(timeout: 1)
         when:

ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/json/JSONMeterValuesSpec.groovy

@@ -27,6 +27,10 @@ class JSONMeterValuesSpec extends Specification
         chargePoint.disconnect()
     }
 
+    def cleanupSpec() {
+        centralSystem.stopped()
+    }
+
     def "Charge point sends MeterValues request and receives a response"() {
         def conditions = new PollingConditions(timeout: 1)
         when:

ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/json/JSONRemoteStartTransactionSpec.groovy

@@ -26,6 +26,10 @@ class JSONRemoteStartTransactionSpec extends Specification {
         chargePoint.disconnect()
     }
 
+    def cleanupSpec() {
+        centralSystem.stopped()
+    }
+
     def "Central System sends a RemoteStartTransaction request and receives a response"() {
         def conditions = new PollingConditions(timeout: 1)
         given:

ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/json/JSONRemoteStopTransactionSpec.groovy

@@ -26,6 +26,10 @@ class JSONRemoteStopTransactionSpec extends Specification {
         chargePoint.disconnect()
     }
 
+    def cleanupSpec() {
+        centralSystem.stopped()
+    }
+
     def "Central System sends a RemoteStopTransaction request and receives a response"() {
         def conditions = new PollingConditions(timeout: 10)
         given:

ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/json/JSONResetSpec.groovy

@@ -27,6 +27,10 @@ class JSONResetSpec extends Specification {
         chargePoint.disconnect()
     }
 
+    def cleanupSpec() {
+        centralSystem.stopped()
+    }
+
     def "Central System sends a Reset request and receives a response"() {
         def conditions = new PollingConditions(timeout: 1)
         when:

ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/json/JSONStartTransactionSpec.groovy

@@ -26,6 +26,10 @@ class JSONStartTransactionSpec extends Specification {
         chargePoint.disconnect()
     }
 
+    def cleanupSpec() {
+        centralSystem.stopped()
+    }
+
     def "Charge point sends StartTransaction request and receives a response"() {
         def conditions = new PollingConditions(timeout: 1)
         when:

ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/json/JSONStatusNotificationSpec.groovy

@@ -26,6 +26,10 @@ class JSONStatusNotificationSpec extends Specification {
         chargePoint.disconnect()
     }
 
+    def cleanupSpec() {
+        centralSystem.stopped()
+    }
+
     def "Charge point sends StatusNotification request and receives a response"() {
         def conditions = new PollingConditions(timeout: 1)
         when:

ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/json/JSONStopTransactionSpec.groovy

@@ -26,6 +26,10 @@ class JSONStopTransactionSpec extends Specification {
         chargePoint.disconnect()
     }
 
+    def cleanupSpec() {
+        centralSystem.stopped()
+    }
+
     def "Charge point sends StopTransaction request and receives a response"() {
         def conditions = new PollingConditions(timeout: 1)
         when:

ocpp-v1_6-test/src/test/groovy/eu/chargetime/ocpp/test/core/json/JSONUnlockConnectorSpec.groovy

@@ -26,6 +26,10 @@ class JSONUnlockConnectorSpec extends Specification {
         chargePoint.disconnect()
     }
 
+    def cleanupSpec() {
+        centralSystem.stopped()
+    }
+
     def "Central System sends a UnlockConnector request and receives a response"() {
         def conditions = new PollingConditions(timeout: 10)
         given:

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/JSONClient.java

@@ -116,6 +116,11 @@ public JSONClient enableWSS(WssSocketBuilder wssSocketBuilder) {
         return this;
     }
 
+    /**
+     * Set WebSocket ping interval.
+     *
+     * @param interval ping interval in seconds.
+     */
     public void setPingInterval(int interval) {
         // Set ping interval in seconds
         transmitter.setPingInterval(interval);

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/JSONServer.java

@@ -37,6 +37,8 @@ of this software and associated documentation files (the "Software"), to deal
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
+import javax.net.ssl.SSLContext;
+import java.io.IOException;
 import java.util.Collections;
 import javax.net.ssl.SSLContext;
 import java.io.IOException;
@@ -102,6 +104,11 @@ public JSONServer enableWSS(WssFactoryBuilder wssFactoryBuilder) {
         return this;
     }
 
+    /**
+     * Set WebSocket ping interval.
+     *
+     * @param interval ping interval in seconds.
+     */
     public void setPingInterval(int interval) {
         // Set ping interval in seconds
         listener.setPingInterval(interval);

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/WebSocketTransmitter.java

@@ -92,8 +92,8 @@ public void onError(Exception ex) {
         };
 
         if(WSS_SCHEME.equals(resource.getScheme())) {
-		
-			if(wssSocketBuilder == null) {
+
+            if(wssSocketBuilder == null) {
                 throw new IllegalStateException("wssSocketBuilder must be set to support " + WSS_SCHEME + " scheme");
             }