Removed unnecessary handlers.

Author: TVolden

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

@@ -1,7 +1,10 @@
 package eu.chargetime.ocpp.test;
 
 import eu.chargetime.ocpp.*;
-import eu.chargetime.ocpp.feature.profile.*;
+import eu.chargetime.ocpp.feature.profile.ServerCoreEventHandler;
+import eu.chargetime.ocpp.feature.profile.ServerCoreProfile;
+import eu.chargetime.ocpp.feature.profile.ServerRemoteTriggerProfile;
+import eu.chargetime.ocpp.feature.profile.ServerSmartChargingProfile;
 import eu.chargetime.ocpp.model.Confirmation;
 import eu.chargetime.ocpp.model.Request;
 import eu.chargetime.ocpp.model.core.*;
@@ -37,8 +40,7 @@ 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 FakeCentralSystem
-{
+public class FakeCentralSystem {
     private Request receivedRequest;
     private Confirmation receivedConfirmation;
     private Server server;
@@ -49,14 +51,15 @@ public class FakeCentralSystem
     private boolean isRigged;
     private String currentIdentifier;
 
-    public static FakeCentralSystem getInstance () {
+    public static FakeCentralSystem getInstance() {
         if (instance == null)
             instance = new FakeCentralSystem();
 
         return instance;
     }
 
-    private FakeCentralSystem() { }
+    private FakeCentralSystem() {
+    }
 
     private <T extends Confirmation> T failurePoint(T confirmation) {
         if (isRigged) {
@@ -74,15 +77,13 @@ public void clientLost() {
         server.closeSession(currentSessionIndex);
     }
 
-    public enum serverType {JSON, SOAP}
+    public enum serverType {JSON, SOAP;}
 
-    public void started() throws Exception
-    {
+    public void started() throws Exception {
         started(serverType.JSON);
     }
 
-    private boolean matchServerType(serverType type)
-    {
+    private boolean matchServerType(serverType type) {
         boolean result = false;
         switch (type) {
             case JSON:
@@ -94,8 +95,7 @@ private boolean matchServerType(serverType type)
         return result;
     }
 
-    public void started(serverType type) throws Exception
-    {
+    public void started(serverType type) throws Exception {
         if (server != null) {
             if (matchServerType(type)) {
                 return;
@@ -180,13 +180,9 @@ public StopTransactionConfirmation handleStopTransactionRequest(UUID sessionInde
             }
         });
 
-        ServerSmartChargingProfile smartChargingProfile = new ServerSmartChargingProfile(new ServerSmartChargingHandler() {
-
-        });
+        ServerSmartChargingProfile smartChargingProfile = new ServerSmartChargingProfile();
 
-        ServerRemoteTriggerProfile remoteTriggerProfile = new ServerRemoteTriggerProfile(new ServerRemoteTriggerHandler() {
-
-        });
+        ServerRemoteTriggerProfile remoteTriggerProfile = new ServerRemoteTriggerProfile();
 
         int port = 0;
         switch (type) {
@@ -221,6 +217,10 @@ public void lostSession(UUID identity) {
         });
     }
 
+    public boolean hasReceivedGetDiagnosticsConfirmation() {
+        return false;
+    }
+
     public boolean hasHandledAuthorizeRequest() {
         return receivedRequest instanceof AuthorizeRequest;
     }

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/feature/profile/ServerRemoteTriggerHandler.java

@@ -40,11 +40,9 @@ of this software and associated documentation files (the "Software"), to deal
 
 public class ServerRemoteTriggerProfile implements Profile {
 
-    private final ServerRemoteTriggerHandler handler;
     private HashSet<Feature> features;
 
-    public ServerRemoteTriggerProfile(ServerRemoteTriggerHandler handler) {
-        this.handler = handler;
+    public ServerRemoteTriggerProfile() {
 
         features = new HashSet<>();
         features.add(new TriggerMessageFeature(this));

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/feature/profile/ServerRemoteTriggerProfile.java

@@ -1,7 +1,8 @@
 package eu.chargetime.ocpp.feature.profile;
 
 import eu.chargetime.ocpp.PropertyConstraintException;
-import eu.chargetime.ocpp.feature.*;
+import eu.chargetime.ocpp.feature.Feature;
+import eu.chargetime.ocpp.feature.SetChargingProfileFeature;
 import eu.chargetime.ocpp.model.Confirmation;
 import eu.chargetime.ocpp.model.Request;
 import eu.chargetime.ocpp.model.core.ChargingProfile;
@@ -38,12 +39,9 @@
 
 public class ServerSmartChargingProfile implements Profile {
 
-    private final ServerSmartChargingHandler handler;
     private HashSet<Feature> features;
 
-    public ServerSmartChargingProfile(ServerSmartChargingHandler handler) {
-        this.handler = handler;
-
+    public ServerSmartChargingProfile() {
         features = new HashSet<>();
         features.add(new SetChargingProfileFeature(this));
     }

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/feature/profile/ServerSmartChargingHandler.java

@@ -2,20 +2,17 @@
 
 import eu.chargetime.ocpp.feature.Feature;
 import eu.chargetime.ocpp.feature.TriggerMessageFeature;
-import eu.chargetime.ocpp.feature.profile.ServerRemoteTriggerHandler;
 import eu.chargetime.ocpp.feature.profile.ServerRemoteTriggerProfile;
 import eu.chargetime.ocpp.model.remotetrigger.TriggerMessageRequest;
 import eu.chargetime.ocpp.model.remotetrigger.TriggerMessageRequestType;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
-import static org.mockito.Mockito.mock;
 
 /*
  * ChargeTime.eu - Java-OCA-OCPP
@@ -48,12 +45,9 @@ public class ServerRemoteTriggerProfileTest {
 
     private ServerRemoteTriggerProfile profile;
 
-    @Mock
-    private ServerRemoteTriggerHandler handler;
-
     @Before
     public void setup() {
-        profile = new ServerRemoteTriggerProfile(handler);
+        profile = new ServerRemoteTriggerProfile();
     }
 
     @Test

ocpp-v1_6/src/main/java/eu/chargetime/ocpp/feature/profile/ServerSmartChargingProfile.java

@@ -2,21 +2,17 @@
 
 import eu.chargetime.ocpp.feature.Feature;
 import eu.chargetime.ocpp.feature.SetChargingProfileFeature;
-import eu.chargetime.ocpp.feature.profile.ServerSmartChargingHandler;
 import eu.chargetime.ocpp.feature.profile.ServerSmartChargingProfile;
 import eu.chargetime.ocpp.model.core.*;
 import eu.chargetime.ocpp.model.smartcharging.SetChargingProfileRequest;
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.mockito.Mock;
 import org.mockito.runners.MockitoJUnitRunner;
 
 import static org.hamcrest.CoreMatchers.instanceOf;
 import static org.hamcrest.CoreMatchers.is;
 import static org.junit.Assert.assertThat;
-import static org.mockito.Matchers.eq;
-import static org.mockito.Mockito.mock;
 
 /*
  * ChargeTime.eu - Java-OCA-OCPP
@@ -49,12 +45,9 @@ public class ServerSmartChargingProfileTest {
 
     private ServerSmartChargingProfile smartCharging;
 
-    @Mock
-    private ServerSmartChargingHandler handler;
-
     @Before
     public void setup() {
-        smartCharging = new ServerSmartChargingProfile(handler);
+        smartCharging = new ServerSmartChargingProfile();
     }
 
     @Test