Stronger validation on Requests and Confirmations

Improve JavaDoc

Author: raddatzk

gradlew

@@ -5,6 +5,7 @@
    MIT License
 
    Copyright (C) 2016-2018 Thomas Volden <[email protected]>
+   Copyright (C) 2019 Kevin Raddatz <[email protected]>
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -29,64 +30,65 @@ of this software and associated documentation files (the "Software"), to deal
 import eu.chargetime.ocpp.model.Confirmation;
 import eu.chargetime.ocpp.model.Request;
 import eu.chargetime.ocpp.model.firmware.*;
+
 import java.util.HashSet;
 import java.util.UUID;
 
 public class ClientFirmwareManagementProfile implements Profile {
 
-  private HashSet<Feature> features;
-  private ClientFirmwareManagementEventHandler eventHandler;
-
-  public ClientFirmwareManagementProfile(ClientFirmwareManagementEventHandler eventHandler) {
-    this.eventHandler = eventHandler;
-    features = new HashSet<>();
-    features.add(new GetDiagnosticsFeature(this));
-    features.add(new DiagnosticsStatusNotificationFeature(this));
-    features.add(new FirmwareStatusNotificationFeature(this));
-    features.add(new UpdateFirmwareFeature(this));
-  }
-
-  /**
-   * Create a {@link DiagnosticsStatusNotificationRequest} with required values.
-   *
-   * @param status required. Identification of the {@link DiagnosticsStatus}.
-   * @return an instance of {@link DiagnosticsStatusNotificationRequest}.
-   * @see DiagnosticsStatusNotificationRequest
-   * @see DiagnosticsStatusNotificationFeature
-   */
-  public DiagnosticsStatusNotificationRequest createDiagnosticsStatusNotificationRequest(
-      DiagnosticsStatus status) {
-    return new DiagnosticsStatusNotificationRequest(status);
-  }
-
-  /**
-   * Create a {@link FirmwareStatusNotificationRequest} with required values.
-   *
-   * @param status required. Identification of the {@link FirmwareStatus}.
-   * @return an instance of {@link FirmwareStatusNotificationRequest}.
-   * @see FirmwareStatusNotificationRequest
-   * @see FirmwareStatusNotificationFeature
-   */
-  public FirmwareStatusNotificationRequest createFirmwareStatusNotificationRequest(
-      FirmwareStatus status) {
-    return new FirmwareStatusNotificationRequest(status);
-  }
-
-  @Override
-  public ProfileFeature[] getFeatureList() {
-    return features.toArray(new ProfileFeature[0]);
-  }
-
-  @Override
-  public Confirmation handleRequest(UUID sessionIndex, Request request) {
-    Confirmation result = null;
-
-    if (request instanceof GetDiagnosticsRequest) {
-      result = eventHandler.handleGetDiagnosticsRequest((GetDiagnosticsRequest) request);
-    } else if (request instanceof UpdateFirmwareRequest) {
-      result = eventHandler.handleUpdateFirmwareRequest((UpdateFirmwareRequest) request);
+    private HashSet<Feature> features;
+    private ClientFirmwareManagementEventHandler eventHandler;
+
+    public ClientFirmwareManagementProfile(ClientFirmwareManagementEventHandler eventHandler) {
+        this.eventHandler = eventHandler;
+        features = new HashSet<>();
+        features.add(new DiagnosticsStatusNotificationFeature(null));
+        features.add(new FirmwareStatusNotificationFeature(null));
+        features.add(new GetDiagnosticsFeature(this));
+        features.add(new UpdateFirmwareFeature(this));
+    }
+
+    /**
+     * Create a {@link DiagnosticsStatusNotificationRequest} with required values.
+     *
+     * @param status required. Identification of the {@link DiagnosticsStatus}.
+     * @return an instance of {@link DiagnosticsStatusNotificationRequest}.
+     * @see DiagnosticsStatusNotificationRequest
+     * @see DiagnosticsStatusNotificationFeature
+     */
+    public DiagnosticsStatusNotificationRequest createDiagnosticsStatusNotificationRequest(
+            DiagnosticsStatus status) {
+        return new DiagnosticsStatusNotificationRequest(status);
+    }
+
+    /**
+     * Create a {@link FirmwareStatusNotificationRequest} with required values.
+     *
+     * @param status required. Identification of the {@link FirmwareStatus}.
+     * @return an instance of {@link FirmwareStatusNotificationRequest}.
+     * @see FirmwareStatusNotificationRequest
+     * @see FirmwareStatusNotificationFeature
+     */
+    public FirmwareStatusNotificationRequest createFirmwareStatusNotificationRequest(
+            FirmwareStatus status) {
+        return new FirmwareStatusNotificationRequest(status);
     }
 
-    return result;
-  }
+    @Override
+    public ProfileFeature[] getFeatureList() {
+        return features.toArray(new ProfileFeature[0]);
+    }
+
+    @Override
+    public Confirmation handleRequest(UUID sessionIndex, Request request) {
+        Confirmation result = null;
+
+        if (request instanceof GetDiagnosticsRequest) {
+            result = eventHandler.handleGetDiagnosticsRequest((GetDiagnosticsRequest) request);
+        } else if (request instanceof UpdateFirmwareRequest) {
+            result = eventHandler.handleUpdateFirmwareRequest((UpdateFirmwareRequest) request);
+        }
+
+        return result;
+    }
 }

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

@@ -7,6 +7,7 @@
 
    Copyright (C) 2016-2018 Thomas Volden <[email protected]>
    Copyright (C) 2018 Mikhail Kladkevich <[email protected]>
+   Copyright (C) 2019 Kevin Raddatz <[email protected]>
 
    Permission is hereby granted, free of charge, to any person obtaining a copy
    of this software and associated documentation files (the "Software"), to deal
@@ -27,41 +28,45 @@ of this software and associated documentation files (the "Software"), to deal
    SOFTWARE.
 */
 
-import eu.chargetime.ocpp.feature.*;
+import eu.chargetime.ocpp.feature.CancelReservationFeature;
+import eu.chargetime.ocpp.feature.Feature;
+import eu.chargetime.ocpp.feature.ProfileFeature;
+import eu.chargetime.ocpp.feature.ReserveNowFeature;
 import eu.chargetime.ocpp.model.Confirmation;
 import eu.chargetime.ocpp.model.Request;
 import eu.chargetime.ocpp.model.reservation.CancelReservationRequest;
 import eu.chargetime.ocpp.model.reservation.ReserveNowRequest;
+
 import java.util.HashSet;
 import java.util.UUID;
 
 public class ClientReservationProfile implements Profile {
 
-  private HashSet<Feature> features;
-  private ClientReservationEventHandler eventHandler;
+    private HashSet<Feature> features;
+    private ClientReservationEventHandler eventHandler;
 
-  public ClientReservationProfile(ClientReservationEventHandler eventHandler) {
-    this.eventHandler = eventHandler;
-    features = new HashSet<>();
-    features.add(new ReserveNowFeature(this));
-    features.add(new CancelReservationFeature(this));
-  }
+    public ClientReservationProfile(ClientReservationEventHandler eventHandler) {
+        this.eventHandler = eventHandler;
+        features = new HashSet<>();
+        features.add(new CancelReservationFeature(this));
+        features.add(new ReserveNowFeature(this));
+    }
 
-  @Override
-  public ProfileFeature[] getFeatureList() {
-    return features.toArray(new ProfileFeature[0]);
-  }
+    @Override
+    public ProfileFeature[] getFeatureList() {
+        return features.toArray(new ProfileFeature[0]);
+    }
 
-  @Override
-  public Confirmation handleRequest(UUID sessionIndex, Request request) {
-    Confirmation result = null;
+    @Override
+    public Confirmation handleRequest(UUID sessionIndex, Request request) {
+        Confirmation result = null;
 
-    if (request instanceof ReserveNowRequest) {
-      result = eventHandler.handleReserveNowRequest((ReserveNowRequest) request);
-    } else if (request instanceof CancelReservationRequest) {
-      result = eventHandler.handleCancelReservationRequest((CancelReservationRequest) request);
-    }
+        if (request instanceof CancelReservationRequest) {
+            result = eventHandler.handleCancelReservationRequest((CancelReservationRequest) request);
+        } else if (request instanceof ReserveNowRequest) {
+            result = eventHandler.handleReserveNowRequest((ReserveNowRequest) request);
+        }
 
-    return result;
-  }
+        return result;
+    }
 }

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

@@ -61,14 +61,14 @@ public ProfileFeature[] getFeatureList() {
     public Confirmation handleRequest(UUID sessionIndex, Request request) {
         Confirmation result = null;
 
-        if (request instanceof SetChargingProfileRequest) {
-            result = eventHandler.handleSetChargingProfileRequest((SetChargingProfileRequest) request);
-        } else if (request instanceof ClearChargingProfileRequest) {
+        if (request instanceof ClearChargingProfileRequest) {
             result =
                     eventHandler.handleClearChargingProfileRequest((ClearChargingProfileRequest) request);
         } else if (request instanceof GetCompositeScheduleRequest) {
             result =
                     eventHandler.handleGetCompositeScheduleRequest((GetCompositeScheduleRequest) request);
+        } else if (request instanceof SetChargingProfileRequest) {
+            result = eventHandler.handleSetChargingProfileRequest((SetChargingProfileRequest) request);
         }
 
         return result;