Created JSONClient

Author: TVolden

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

@@ -35,10 +35,8 @@ of this software and associated documentation files (the "Software"), to deal
  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
  SOFTWARE.
  */
-public class Client
+public abstract class Client
 {
-    private final int INDEX_UNIQUEID = 1;
-
     private HashMap<String, CompletableFuture<Confirmation>> promises;
     private ArrayList<Feature> featureList;
     private Session session;

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

@@ -60,18 +60,14 @@ public class ClientTest extends TestUtilities {
 
     @Before
     public void setup() {
-        request = new Request() {
-            @Override
-            public boolean validate() {
-                return false;
-            }
-        };
+        request = () -> false;
         doReturn(request.getClass()).when(feature).getRequestType();
         doReturn(TestConfirmation.class).when(feature).getConfirmationType();
         when(feature.getAction()).thenReturn(null);
         doAnswer(invocation -> eventHandler = invocation.getArgumentAt(1, SessionEvents.class)).when(session).open(any(), any());
 
-        client = new Client(session);
+        client = new Client(session) {
+        };
 
         when(profile.getFeatureList()).thenReturn(aList(feature));
         client.addFeatureProfile(profile);

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

@@ -1,6 +1,9 @@
 package eu.chargetime.ocpp.test;
 
-import eu.chargetime.ocpp.*;
+import eu.chargetime.ocpp.Client;
+import eu.chargetime.ocpp.JSONClient;
+import eu.chargetime.ocpp.PropertyConstraintException;
+import eu.chargetime.ocpp.UnsupportedFeatureException;
 import eu.chargetime.ocpp.feature.profile.ClientCoreEventHandler;
 import eu.chargetime.ocpp.feature.profile.CoreProfile;
 import eu.chargetime.ocpp.model.*;
@@ -99,8 +102,7 @@ public UnlockConnectorConfirmation handleUnlockConnectorRequest(UnlockConnectorR
                 return new UnlockConnectorConfirmation(UnlockStatus.Unlocked);
             }
         });
-        client = new Client(new Session(new JSONCommunicator(new WebSocketTransmitter()), new Queue()));
-        client.addFeatureProfile(core);
+        client = new JSONClient(core);
     }
 
     public void connect() {

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

@@ -0,0 +1,36 @@
+package eu.chargetime.ocpp;
+
+import eu.chargetime.ocpp.feature.profile.CoreProfile;
+
+/**
+ * ChargeTime.eu - Java-OCA-OCPP
+ * <p>
+ * MIT License
+ * <p>
+ * Copyright (C) 2016 Thomas Volden <[email protected]>
+ * <p>
+ * 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:
+ * <p>
+ * The above copyright notice and this permission notice shall be included in all
+ * copies or substantial portions of the Software.
+ * <p>
+ * 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 class JSONClient extends Client {
+
+    public JSONClient(CoreProfile coreProfile) {
+        super(new Session(new JSONCommunicator(new WebSocketTransmitter()), new Queue()));
+        addFeatureProfile(coreProfile);
+    }
+}