[CSAPI] Fix to deserialize command parameters + set timestamp

Author: alexrobin

sensorhub-service-consys/src/main/java/org/sensorhub/impl/service/consys/client/ConSysApiClient.java

@@ -50,7 +50,6 @@
 import java.util.stream.Stream;
 import java.util.stream.StreamSupport;
 import net.opengis.swe.v20.BinaryEncoding;
-import org.sensorhub.api.command.CommandStatus;
 import org.sensorhub.api.command.CommandStreamInfo;
 import org.sensorhub.api.command.ICommandData;
 import org.sensorhub.api.command.ICommandStatus;
@@ -85,7 +84,6 @@
 import org.sensorhub.impl.service.consys.task.CommandBindingJson;
 import org.sensorhub.impl.service.consys.task.CommandBindingSweCommon;
 import org.sensorhub.impl.service.consys.task.CommandHandler;
-import org.sensorhub.impl.service.consys.task.CommandResultBindingSweCommon;
 import org.sensorhub.impl.service.consys.task.CommandStatusBindingJson;
 import org.sensorhub.impl.service.consys.task.CommandStatusHandler.CommandStatusHandlerContextData;
 import org.sensorhub.impl.service.consys.task.CommandStreamBindingJson;

sensorhub-service-consys/src/main/java/org/sensorhub/impl/service/consys/task/CommandBindingJson.java

@@ -35,10 +35,12 @@
 import org.sensorhub.impl.service.consys.resource.ResourceBindingJson;
 import org.sensorhub.impl.service.consys.resource.ResourceLink;
 import org.sensorhub.impl.service.consys.task.CommandHandler.CommandHandlerContextData;
+import org.sensorhub.utils.SWEDataUtils;
 import org.vast.cdm.common.DataStreamWriter;
 import org.vast.swe.BinaryDataWriter;
 import org.vast.swe.IComponentFilter;
 import org.vast.swe.SWEConstants;
+import org.vast.swe.ScalarIndexer;
 import org.vast.swe.fast.JsonDataParserGson;
 import org.vast.swe.fast.JsonDataWriterGson;
 import org.vast.util.ReaderException;
@@ -56,6 +58,7 @@ public class CommandBindingJson extends ResourceBindingJson<BigId, ICommandData>
     ICommandStore cmdStore;
     JsonDataParserGson paramsReader;
     Map<BigId, DataStreamWriter> paramsWriters;
+    ScalarIndexer timeStampIndexer;
     String userID;
 
 
@@ -68,6 +71,7 @@ public CommandBindingJson(RequestContext ctx, IdEncoders idEncoders, boolean for
         if (forReading)
         {
             this.paramsReader = getSweCommonParser(contextData.csInfo, reader);
+            this.timeStampIndexer = SWEDataUtils.getTimeStampIndexer(contextData.csInfo.getRecordStructure());
 
             var user = ctx.getSecurityHandler().getCurrentUser();
             this.userID = user != null ? user.getId() : "api";
@@ -104,16 +108,21 @@ public ICommandData deserialize(JsonReader reader) throws IOException
         try
         {
             reader.beginObject();
-            
+                        
             while (reader.hasNext())
             {
                 var propName = reader.nextName();
 
-                if ("issueTime".equals(propName))
-                    cmd.withIssueTime(OffsetDateTime.parse(reader.nextString()).toInstant());
+                if ("issueTime".equals(propName)) {
+                    if (reader.peek() != JsonToken.NULL) {
+                        cmd.withIssueTime(OffsetDateTime.parse(reader.nextString()).toInstant());
+                    } else {
+                        reader.nextNull();
+                    }
+                }
                 //else if ("foi".equals(propName))
                 //    obs.withFoi(id)
-                else if ("params".equals(propName))
+                else if ("parameters".equals(propName))
                 {
                     var result = paramsReader.parseNextBlock();
                     cmd.withParams(result);
@@ -133,11 +142,18 @@ else if ("params".equals(propName))
             throw new ResourceParseException(INVALID_JSON_ERROR_MSG + e.getMessage());
         }
 
-        if (contextData.foiId != null)
+        if (contextData.foiId != null && contextData.foiId != BigId.NONE)
             cmd.withFoi(contextData.foiId);
 
-        // also set timestamp
-        return cmd.build();
+        // set timestamp in params data if present in schema
+        var newCmd = cmd.build();
+        if (timeStampIndexer != null)
+        {
+            var issueTimeIdx = timeStampIndexer.getDataIndex(newCmd.getParams());
+            newCmd.getParams().setDoubleValue(issueTimeIdx, newCmd.getIssueTime().toEpochMilli() / 1000.0);
+        }
+        
+        return newCmd;
     }
 
 

sensorhub-service-consys/src/main/java/org/sensorhub/impl/service/consys/task/CommandResultBindingSweCommon.java

@@ -20,7 +20,6 @@
 import java.util.Collection;
 import org.sensorhub.api.command.CommandResult;
 import org.sensorhub.api.command.CommandStatus;
-import org.sensorhub.api.command.ICommandResult;
 import org.sensorhub.api.command.ICommandStatus;
 import org.sensorhub.api.command.ICommandStreamInfo;
 import org.sensorhub.api.common.BigId;