fdo.command:execute to have null body

Signed-off-by: Raihan M <muhamedraihan@gmail.com>

Author: raihio

protocol/src/main/java/org/fidoalliance/fdo/protocol/Mapper.java

@@ -135,6 +135,13 @@ public byte[] writeAsCborByteString(Object value) throws IOException {
     return cborMapper.writeValueAsBytes(writeValue(value));
   }
 
+    /**
+     * @return A CBOR Null value.
+     */
+  public byte[] cborNull() {
+      return new byte[]{(byte) 0xf6};
+  }
+
   /**
    * Writes an Object as a yaml encoded string.
    *

protocol/src/main/java/org/fidoalliance/fdo/protocol/db/FdoSimCommandOwnerModule.java

@@ -16,9 +16,7 @@
 import org.fidoalliance.fdo.protocol.message.ServiceInfoDocument;
 import org.fidoalliance.fdo.protocol.message.ServiceInfoKeyValuePair;
 import org.fidoalliance.fdo.protocol.message.ServiceInfoModuleState;
-import org.fidoalliance.fdo.protocol.message.ServiceInfoQueue;
 import org.fidoalliance.fdo.protocol.serviceinfo.DevMod;
-import org.fidoalliance.fdo.protocol.serviceinfo.FdoSys;
 
 public class FdoSimCommandOwnerModule implements ServiceInfoModule {
 
@@ -272,7 +270,7 @@ protected void load(ServiceInfoModuleState state, FdoSysModuleExtra extra)
 
           kv = new ServiceInfoKeyValuePair();
           kv.setKeyName(EXECUTE);
-          kv.setValue(Mapper.INSTANCE.writeValue(commandArgs));
+          kv.setValue(Mapper.INSTANCE.cborNull());
           state.getGlobalState().getQueue().add(kv);
 
 

protocol/src/test/java/org/fidoalliance/fdo/protocol/SerializationTest.java

@@ -3,19 +3,20 @@
 import java.io.IOException;
 import java.util.Arrays;
 
+import com.fasterxml.jackson.databind.JsonNode;
 import org.apache.commons.codec.DecoderException;
 import org.fidoalliance.fdo.protocol.message.AnyType;
 import org.fidoalliance.fdo.protocol.message.Hash;
 import org.fidoalliance.fdo.protocol.message.HashType;
 import org.fidoalliance.fdo.protocol.message.OwnerPublicKey;
 import org.fidoalliance.fdo.protocol.message.PublicKeyEncoding;
 import org.fidoalliance.fdo.protocol.message.PublicKeyType;
-import static org.junit.jupiter.api.Assertions.assertArrayEquals;
-import static org.junit.jupiter.api.Assertions.assertTrue;
 import org.junit.jupiter.api.Test;
 
 import com.fasterxml.jackson.dataformat.cbor.CBORConstants;
 
+import static org.junit.jupiter.api.Assertions.*;
+
 public class SerializationTest {
 
   @Test
@@ -70,4 +71,12 @@ public void wrapCborTest() throws IOException {
     assertArrayEquals(input, Mapper.INSTANCE.readValue(innerCbor, String[].class));
     assertArrayEquals(input, Mapper.INSTANCE.readFromCborByteString(outerBstr, String[].class));
   }
+
+  @Test
+  public void cborNullTest() {
+      byte[] cbor = Mapper.INSTANCE.cborNull();
+
+      assertTrue(CBORConstants.hasMajorType(CBORConstants.MAJOR_TYPE_MISC, cbor[0]));
+      assertEquals(CBORConstants.BYTE_NULL, cbor[0]);
+  }
 }