Fix reversed OCPP 2.1 message directions

Fix the direction of these OCPP 2.1 messages which were reversed:

1. ClosePeriodicEventStreamRequest is CS to CSMS
2. ReportDERControlRequest is CS to CSMS
3. RequestBatterySwapRequest is CSMS to CS

Author: robert-s-ubi

ocpp-v2/src/main/java/eu/chargetime/ocpp/v21/feature/function/ClientDERControlEventHandler.java

@@ -44,14 +44,6 @@ public interface ClientDERControlEventHandler {
    */
   GetDERControlResponse handleGetDERControlRequest(GetDERControlRequest request);
 
-  /**
-   * Handle a {@link ReportDERControlRequest} and return a {@link ReportDERControlResponse}.
-   *
-   * @param request incoming {@link ReportDERControlRequest} to handle.
-   * @return outgoing {@link ReportDERControlResponse} to reply with.
-   */
-  ReportDERControlResponse handleReportDERControlRequest(ReportDERControlRequest request);
-
   /**
    * Handle a {@link SetDERControlRequest} and return a {@link SetDERControlResponse}.
    *

ocpp-v2/src/main/java/eu/chargetime/ocpp/v21/feature/function/ClientDERControlFunction.java

@@ -48,7 +48,7 @@ public ClientDERControlFunction(ClientDERControlEventHandler eventHandler) {
     features.add(new GetDERControlFeature(this));
     features.add(new NotifyDERAlarmFeature(null));
     features.add(new NotifyDERStartStopFeature(null));
-    features.add(new ReportDERControlFeature(this));
+    features.add(new ReportDERControlFeature(null));
     features.add(new SetDERControlFeature(this));
   }
 
@@ -63,8 +63,6 @@ public Confirmation handleRequest(UUID sessionIndex, Request request) {
       return eventHandler.handleClearDERControlRequest((ClearDERControlRequest) request);
     } else if (request instanceof GetDERControlRequest) {
       return eventHandler.handleGetDERControlRequest((GetDERControlRequest) request);
-    } else if (request instanceof ReportDERControlRequest) {
-      return eventHandler.handleReportDERControlRequest((ReportDERControlRequest) request);
     } else if (request instanceof SetDERControlRequest) {
       return eventHandler.handleSetDERControlRequest((SetDERControlRequest) request);
     }
@@ -96,4 +94,14 @@ public NotifyDERStartStopRequest createNotifyDERStartStopRequest(
       String controlId, Boolean started, ZonedDateTime timestamp) {
     return new NotifyDERStartStopRequest(controlId, started, timestamp);
   }
+
+  /**
+   * Create a client {@link ReportDERControlRequest} with all required fields.
+   *
+   * @param requestId RequestId from GetDERControlRequest.
+   * @return an instance of {@link ReportDERControlRequest}
+   */
+  public ReportDERControlRequest createReportDERControlRequest(Integer requestId) {
+    return new ReportDERControlRequest(requestId);
+  }
 }

ocpp-v2/src/main/java/eu/chargetime/ocpp/v21/feature/function/ClientDiagnosticsEventHandler.java

@@ -48,16 +48,6 @@ AdjustPeriodicEventStreamResponse handleAdjustPeriodicEventStreamRequest(
   ClearVariableMonitoringResponse handleClearVariableMonitoringRequest(
       ClearVariableMonitoringRequest request);
 
-  /**
-   * Handle a {@link ClosePeriodicEventStreamRequest} and return a {@link
-   * ClosePeriodicEventStreamResponse}.
-   *
-   * @param request incoming {@link ClosePeriodicEventStreamRequest} to handle.
-   * @return outgoing {@link ClosePeriodicEventStreamResponse} to reply with.
-   */
-  ClosePeriodicEventStreamResponse handleClosePeriodicEventStreamRequest(
-      ClosePeriodicEventStreamRequest request);
-
   /**
    * Handle a {@link CustomerInformationRequest} and return a {@link CustomerInformationResponse}.
    *

ocpp-v2/src/main/java/eu/chargetime/ocpp/v21/feature/function/ClientDiagnosticsFunction.java

@@ -46,7 +46,7 @@ public ClientDiagnosticsFunction(ClientDiagnosticsEventHandler eventHandler) {
     features = new ArrayList<>();
     features.add(new AdjustPeriodicEventStreamFeature(this));
     features.add(new ClearVariableMonitoringFeature(this));
-    features.add(new ClosePeriodicEventStreamFeature(this));
+    features.add(new ClosePeriodicEventStreamFeature(null));
     features.add(new CustomerInformationFeature(this));
     features.add(new GetLogFeature(this));
     features.add(new GetMonitoringReportFeature(this));
@@ -74,9 +74,6 @@ public Confirmation handleRequest(UUID sessionIndex, Request request) {
     } else if (request instanceof ClearVariableMonitoringRequest) {
       return eventHandler.handleClearVariableMonitoringRequest(
           (ClearVariableMonitoringRequest) request);
-    } else if (request instanceof ClosePeriodicEventStreamRequest) {
-      return eventHandler.handleClosePeriodicEventStreamRequest(
-          (ClosePeriodicEventStreamRequest) request);
     } else if (request instanceof CustomerInformationRequest) {
       return eventHandler.handleCustomerInformationRequest((CustomerInformationRequest) request);
     } else if (request instanceof GetLogRequest) {
@@ -97,6 +94,16 @@ public Confirmation handleRequest(UUID sessionIndex, Request request) {
     return null;
   }
 
+  /**
+   * Create a client {@link ClosePeriodicEventStreamRequest} with all required fields.
+   *
+   * @param id Id of stream to close.
+   * @return an instance of {@link ClosePeriodicEventStreamRequest}
+   */
+  public ClosePeriodicEventStreamRequest createClosePeriodicEventStreamRequest(Integer id) {
+    return new ClosePeriodicEventStreamRequest(id);
+  }
+
   /**
    * Create a client {@link LogStatusNotificationRequest} with all required fields.
    *

ocpp-v2/src/main/java/eu/chargetime/ocpp/v21/feature/function/ClientTransactionsEventHandler.java

@@ -36,4 +36,12 @@ public interface ClientTransactionsEventHandler {
    */
   GetTransactionStatusResponse handleGetTransactionStatusRequest(
       GetTransactionStatusRequest request);
+
+  /**
+   * Handle a {@link RequestBatterySwapRequest} and return a {@link RequestBatterySwapResponse}.
+   *
+   * @param request incoming {@link RequestBatterySwapRequest} to handle.
+   * @return outgoing {@link RequestBatterySwapResponse} to reply with.
+   */
+  RequestBatterySwapResponse handleRequestBatterySwapRequest(RequestBatterySwapRequest request);
 }

ocpp-v2/src/main/java/eu/chargetime/ocpp/v21/feature/function/ClientTransactionsFunction.java

@@ -46,7 +46,7 @@ public ClientTransactionsFunction(ClientTransactionsEventHandler eventHandler) {
     features = new ArrayList<>();
     features.add(new BatterySwapFeature(null));
     features.add(new GetTransactionStatusFeature(this));
-    features.add(new RequestBatterySwapFeature(null));
+    features.add(new RequestBatterySwapFeature(this));
     features.add(new TransactionEventFeature(null));
   }
 
@@ -59,6 +59,8 @@ public FunctionFeature[] getFeatureList() {
   public Confirmation handleRequest(UUID sessionIndex, Request request) {
     if (request instanceof GetTransactionStatusRequest) {
       return eventHandler.handleGetTransactionStatusRequest((GetTransactionStatusRequest) request);
+    } else if (request instanceof RequestBatterySwapRequest) {
+      return eventHandler.handleRequestBatterySwapRequest((RequestBatterySwapRequest) request);
     }
     return null;
   }
@@ -82,19 +84,6 @@ public BatterySwapRequest createBatterySwapRequest(
     return new BatterySwapRequest(batteryData, eventType, idToken, requestId);
   }
 
-  /**
-   * Create a client {@link RequestBatterySwapRequest} with all required fields.
-   *
-   * @param idToken A case insensitive identifier to use for the authorization and the type of
-   *     authorization to support multiple forms of identifiers.
-   * @param requestId Request id to match with BatterySwapRequest.
-   * @return an instance of {@link RequestBatterySwapRequest}
-   */
-  public RequestBatterySwapRequest createRequestBatterySwapRequest(
-      IdToken idToken, Integer requestId) {
-    return new RequestBatterySwapRequest(idToken, requestId);
-  }
-
   /**
    * Create a client {@link TransactionEventRequest} with all required fields.
    *

ocpp-v2/src/main/java/eu/chargetime/ocpp/v21/feature/function/ServerDERControlEventHandler.java

@@ -48,4 +48,14 @@ NotifyDERAlarmResponse handleNotifyDERAlarmRequest(
    */
   NotifyDERStartStopResponse handleNotifyDERStartStopRequest(
       UUID sessionIndex, NotifyDERStartStopRequest request);
+
+  /**
+   * Handle a {@link ReportDERControlRequest} and return a {@link ReportDERControlResponse}.
+   *
+   * @param sessionIndex identifier of the session on which the request was received.
+   * @param request incoming {@link ReportDERControlRequest} to handle.
+   * @return outgoing {@link ReportDERControlResponse} to reply with.
+   */
+  ReportDERControlResponse handleReportDERControlRequest(
+      UUID sessionIndex, ReportDERControlRequest request);
 }

ocpp-v2/src/main/java/eu/chargetime/ocpp/v21/feature/function/ServerDERControlFunction.java

@@ -47,7 +47,7 @@ public ServerDERControlFunction(ServerDERControlEventHandler eventHandler) {
     features.add(new GetDERControlFeature(null));
     features.add(new NotifyDERAlarmFeature(this));
     features.add(new NotifyDERStartStopFeature(this));
-    features.add(new ReportDERControlFeature(null));
+    features.add(new ReportDERControlFeature(this));
     features.add(new SetDERControlFeature(null));
   }
 
@@ -64,6 +64,9 @@ public Confirmation handleRequest(UUID sessionIndex, Request request) {
     } else if (request instanceof NotifyDERStartStopRequest) {
       return eventHandler.handleNotifyDERStartStopRequest(
           sessionIndex, (NotifyDERStartStopRequest) request);
+    } else if (request instanceof ReportDERControlRequest) {
+      return eventHandler.handleReportDERControlRequest(
+          sessionIndex, (ReportDERControlRequest) request);
     }
     return null;
   }
@@ -88,16 +91,6 @@ public GetDERControlRequest createGetDERControlRequest(Integer requestId) {
     return new GetDERControlRequest(requestId);
   }
 
-  /**
-   * Create a server {@link ReportDERControlRequest} with all required fields.
-   *
-   * @param requestId RequestId from GetDERControlRequest.
-   * @return an instance of {@link ReportDERControlRequest}
-   */
-  public ReportDERControlRequest createReportDERControlRequest(Integer requestId) {
-    return new ReportDERControlRequest(requestId);
-  }
-
   /**
    * Create a server {@link SetDERControlRequest} with all required fields.
    *

ocpp-v2/src/main/java/eu/chargetime/ocpp/v21/feature/function/ServerDiagnosticsEventHandler.java

@@ -29,6 +29,17 @@ of this software and associated documentation files (the "Software"), to deal
 
 /** Call back handler for server events of the Diagnostics functional block. */
 public interface ServerDiagnosticsEventHandler {
+  /**
+   * Handle a {@link ClosePeriodicEventStreamRequest} and return a {@link
+   * ClosePeriodicEventStreamResponse}.
+   *
+   * @param sessionIndex identifier of the session on which the request was received.
+   * @param request incoming {@link ClosePeriodicEventStreamRequest} to handle.
+   * @return outgoing {@link ClosePeriodicEventStreamResponse} to reply with.
+   */
+  ClosePeriodicEventStreamResponse handleClosePeriodicEventStreamRequest(
+      UUID sessionIndex, ClosePeriodicEventStreamRequest request);
+
   /**
    * Handle a {@link LogStatusNotificationRequest} and return a {@link
    * LogStatusNotificationResponse}.

ocpp-v2/src/main/java/eu/chargetime/ocpp/v21/feature/function/ServerDiagnosticsFunction.java

@@ -45,7 +45,7 @@ public ServerDiagnosticsFunction(ServerDiagnosticsEventHandler eventHandler) {
     features = new ArrayList<>();
     features.add(new AdjustPeriodicEventStreamFeature(null));
     features.add(new ClearVariableMonitoringFeature(null));
-    features.add(new ClosePeriodicEventStreamFeature(null));
+    features.add(new ClosePeriodicEventStreamFeature(this));
     features.add(new CustomerInformationFeature(null));
     features.add(new GetLogFeature(null));
     features.add(new GetMonitoringReportFeature(null));
@@ -67,7 +67,10 @@ public FunctionFeature[] getFeatureList() {
 
   @Override
   public Confirmation handleRequest(UUID sessionIndex, Request request) {
-    if (request instanceof LogStatusNotificationRequest) {
+    if (request instanceof ClosePeriodicEventStreamRequest) {
+      return eventHandler.handleClosePeriodicEventStreamRequest(
+          sessionIndex, (ClosePeriodicEventStreamRequest) request);
+    } else if (request instanceof LogStatusNotificationRequest) {
       return eventHandler.handleLogStatusNotificationRequest(
           sessionIndex, (LogStatusNotificationRequest) request);
     } else if (request instanceof NotifyCustomerInformationRequest) {
@@ -109,16 +112,6 @@ public ClearVariableMonitoringRequest createClearVariableMonitoringRequest(Integ
     return new ClearVariableMonitoringRequest(id);
   }
 
-  /**
-   * Create a server {@link ClosePeriodicEventStreamRequest} with all required fields.
-   *
-   * @param id Id of stream to close.
-   * @return an instance of {@link ClosePeriodicEventStreamRequest}
-   */
-  public ClosePeriodicEventStreamRequest createClosePeriodicEventStreamRequest(Integer id) {
-    return new ClosePeriodicEventStreamRequest(id);
-  }
-
   /**
    * Create a server {@link CustomerInformationRequest} with all required fields.
    *