add request id to task results page

Author: goekay

src/main/java/de/rwth/idsg/steve/ocpp/CommunicationTask.java

@@ -32,6 +32,7 @@
 
 import jakarta.xml.ws.AsyncHandler;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
@@ -51,6 +52,7 @@ public abstract class CommunicationTask<S extends ChargePointSelection, RESPONSE
     private final String operationName;
     private final TaskOrigin origin;
     private final String caller;
+    private final Map<String, String> customDetails; // task-specific details
     protected final S params;
 
     private final Map<String, OcppVersion> versionMap;
@@ -70,19 +72,24 @@ public abstract class CommunicationTask<S extends ChargePointSelection, RESPONSE
     private final ArrayList<OcppCallback<RESPONSE>> callbackList = new ArrayList<>(2);
 
     public CommunicationTask(S params) {
-        this(params, TaskOrigin.INTERNAL, "SteVe");
+        this(params, Collections.emptyMap());
+    }
+
+    public CommunicationTask(S params, Map<String, String> customDetails) {
+        this(params, TaskOrigin.INTERNAL, "SteVe", customDetails);
     }
 
     /**
      * Do not expose the constructor, make it package-private
      */
-    CommunicationTask(S params, TaskOrigin origin, String caller) {
+    CommunicationTask(S params, TaskOrigin origin, String caller, Map<String, String> customDetails) {
         List<ChargePointSelect> cpsList = params.getChargePointSelectList();
 
         this.resultSize = cpsList.size();
         this.origin = origin;
         this.caller = caller;
         this.params = params;
+        this.customDetails = customDetails;
 
         resultMap = new HashMap<>(resultSize);
         versionMap = new HashMap<>(resultSize);

src/main/java/de/rwth/idsg/steve/ocpp/Ocpp15AndAboveTask.java

@@ -23,6 +23,7 @@
 import de.rwth.idsg.steve.web.dto.ocpp.ChargePointSelection;
 
 import jakarta.xml.ws.AsyncHandler;
+import java.util.Map;
 
 /**
  * @author Sevket Goekay <sevketgokay@gmail.com>
@@ -34,6 +35,10 @@ public Ocpp15AndAboveTask(S params) {
         super(params);
     }
 
+    public Ocpp15AndAboveTask(S params, Map<String, String> customDetails) {
+        super(params, customDetails);
+    }
+
     @Deprecated
     @Override
     public <T extends RequestType> T getOcpp12Request() {

src/main/java/de/rwth/idsg/steve/ocpp/Ocpp16AndAboveTask.java

@@ -23,6 +23,7 @@
 import de.rwth.idsg.steve.web.dto.ocpp.ChargePointSelection;
 
 import jakarta.xml.ws.AsyncHandler;
+import java.util.Map;
 
 /**
  * @author Sevket Goekay <sevketgokay@gmail.com>
@@ -34,6 +35,10 @@ public Ocpp16AndAboveTask(S params) {
         super(params);
     }
 
+    public Ocpp16AndAboveTask(S params, Map<String, String> customDetails) {
+        super(params, customDetails);
+    }
+
     @Deprecated
     @Override
     public <T extends RequestType> T getOcpp15Request() {

src/main/java/de/rwth/idsg/steve/ocpp/task/GetLogTask.java

@@ -26,13 +26,14 @@
 import ocpp._2022._02.security.LogParametersType;
 
 import jakarta.xml.ws.AsyncHandler;
+import java.util.Map;
 
 public class GetLogTask extends Ocpp16AndAboveTask<GetLogParams, String> {
 
     private final int requestId;
 
     public GetLogTask(GetLogParams params, int requestId) {
-        super(params);
+        super(params, Map.of("Job/Request ID", String.valueOf(requestId)));
         this.requestId = requestId;
     }
 

src/main/java/de/rwth/idsg/steve/ocpp/task/SignedUpdateFirmwareTask.java

@@ -26,13 +26,14 @@
 import ocpp._2022._02.security.SignedUpdateFirmwareResponse;
 
 import jakarta.xml.ws.AsyncHandler;
+import java.util.Map;
 
 public class SignedUpdateFirmwareTask extends Ocpp16AndAboveTask<SignedUpdateFirmwareParams, String> {
 
     private final int requestId;
 
     public SignedUpdateFirmwareTask(SignedUpdateFirmwareParams params, int requestId) {
-        super(params);
+        super(params, Map.of("Job/Request ID", String.valueOf(requestId)));
         this.requestId = requestId;
     }
 

src/main/webapp/WEB-INF/views/taskResult.jsp

@@ -33,6 +33,9 @@
         <table id='details' class='cpd'>
             <thead><tr><th>Task Details</th><th></th></tr></thead>
             <tr><td>Operation name</td><td>${task.operationName}</td></tr>
+            <c:forEach var="entry" items="${task.customDetails}">
+                <tr><td>${entry.key}</td><td>${entry.value}</td></tr>
+            </c:forEach>
             <tr><td>Origin</td><td>${task.origin} (${task.caller})</td></tr>
             <tr><td>Start timestamp</td><td>${task.startTimestamp}</td></tr>
             <tr><td>End timestamp</td><td>${task.endTimestamp}</td></tr>