Added connect / disconnect client events.

Author: emilm

ocpp-common/src/main/java/eu/chargetime/ocpp/Client.java

@@ -61,7 +61,17 @@ public Client(Session session) {
      *
      * @param   uri     url and port of the server
      */
-    public void connect(String uri)
+    public void connect(String uri) {
+        this.connect(uri, null);
+    }
+
+    /**
+     * Connect to server
+     *
+     * @param   uri     url and port of the server
+     * @param   events  client events for connect/disconnect
+     */
+    public void connect(String uri, ClientEvents events)
     {
         session.open(uri, new SessionEvents() {
             @Override
@@ -94,12 +104,14 @@ public void handleError(String uniqueId, String errorCode, String errorDescripti
 
             @Override
             public void handleConnectionClosed() {
-
+                if (events != null)
+                    events.connectionClosed();
             }
 
             @Override
             public void handleConnectionOpened() {
-
+                if (events != null)
+                    events.connectionOpened();
             }
         });
     }

ocpp-common/src/main/java/eu/chargetime/ocpp/ClientEvents.java

@@ -0,0 +1,33 @@
+package eu.chargetime.ocpp;
+
+/*
+ ChargeTime.eu - Java-OCA-OCPP
+ Copyright (C) 2017 Emil Christopher Solli Melar <[email protected]>
+
+ MIT License
+
+ Copyright (C) 2017 Emil Christopher Solli Melar
+
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ SOFTWARE.
+ */
+
+public interface ClientEvents {
+    void connectionOpened();
+    void connectionClosed();
+}

ocpp-common/src/test/java/eu/chargetime/ocpp/test/ClientTest.java

@@ -1,6 +1,7 @@
 package eu.chargetime.ocpp.test;
 
 import eu.chargetime.ocpp.Client;
+import eu.chargetime.ocpp.ClientEvents;
 import eu.chargetime.ocpp.Session;
 import eu.chargetime.ocpp.SessionEvents;
 import eu.chargetime.ocpp.feature.Feature;
@@ -87,6 +88,34 @@ public void connect_connects() {
         verify(session, times(1)).open(eq(someUrl), anyObject());
     }
 
+    @Test
+    public void connect_connectionOpenedEvent() {
+        // Given
+        ClientEvents events = mock(ClientEvents.class);
+        client.connect(null, events);
+
+        // When
+        this.eventHandler.handleConnectionOpened();
+
+        // Then
+        verify(events, times(1)).connectionOpened();
+        verify(events, never()).connectionClosed();
+    }
+
+    @Test
+    public void connect_connectionClosedEvent() {
+        // Given
+        ClientEvents events = mock(ClientEvents.class);
+        client.connect(null, events);
+
+        // When
+        this.eventHandler.handleConnectionClosed();
+
+        // Then
+        verify(events, times(1)).connectionClosed();
+        verify(events, never()).connectionOpened();
+    }
+
     @Test
     public void send_aMessage_isCommunicated() throws Exception {
         // When

ocpp-v1_6-test/src/main/java/eu/chargetime/ocpp/test/FakeChargePoint.java

@@ -131,7 +131,17 @@ public UnlockConnectorConfirmation handleUnlockConnectorRequest(UnlockConnectorR
 
     public void connect() {
         try {
-            client.connect(url);
+            client.connect(url, new ClientEvents() {
+                @Override
+                public void connectionOpened() {
+                    
+                }
+
+                @Override
+                public void connectionClosed() {
+
+                }
+            });
         } catch (Exception ex) {
             ex.printStackTrace();
         }

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/ChargingProfile.java

@@ -50,7 +50,7 @@ public boolean validate() {
         valid &= chargingProfileId != null;
         valid &= stackLevel >= 0;
         valid &= chargingProfilePurpose != null;
-        valid &= transactionId == null || "TxProfile".equals(chargingProfilePurpose);
+        valid &= transactionId == null || chargingProfilePurpose == ChargingProfilePurposeType.TxProfile;
         valid &= chargingProfileKind != null;
         valid &= chargingSchedule != null && chargingSchedule.validate();
         return valid;

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/model/core/RemoteStartTransactionRequest.java

@@ -50,7 +50,7 @@ public boolean validate() {
 
         if (chargingProfile != null) {
             valid &= chargingProfile.validate();
-            valid &= "TxProfile".equals(chargingProfile.getChargingProfilePurpose());
+            valid &= chargingProfile.getChargingProfilePurpose() == ChargingProfilePurposeType.TxProfile;
         }
         return valid;
     }