Merge pull request #1270 from gytsen/main

fix: add unsigned short support in table deserialisation

Author: michaelklishin

projects/RabbitMQ.Client/client/impl/WireFormatting.Read.cs

@@ -130,6 +130,9 @@ static object ReadFieldValueSlow(ReadOnlySpan<byte> span, out int bytesRead)
                     case 's':
                         bytesRead = 3;
                         return NetworkOrderDeserializer.ReadInt16(slice);
+                    case 'u':
+                        bytesRead = 3;
+                        return NetworkOrderDeserializer.ReadUInt16(slice);
                     case 'T':
                         bytesRead = 1 + ReadTimestamp(slice, out var timestamp);
                         return timestamp;

projects/RabbitMQ.Client/client/impl/WireFormatting.Write.cs

@@ -200,6 +200,10 @@ static int WriteFieldValueSlow(ref byte destination, ref byte fieldValue, object
                     case BinaryTableValue val:
                         destination = (byte)'x';
                         return 1 + WriteLongstr(ref fieldValue, val.Bytes);
+                    case ushort val:
+                        destination = (byte)'u';
+                        NetworkOrderSerializer.WriteUInt16(ref fieldValue, val);
+                        return 3;
                     default:
                         return ThrowInvalidTableValue(value);
                 }
@@ -235,6 +239,8 @@ public static int GetFieldValueByteCount(object value)
                     return 2;
                 case short _:
                     return 3;
+                case ushort _:
+                    return 3;
                 case uint _:
                     return 5;
                 case decimal _:

projects/Unit/TestFieldTableFormatting.cs

@@ -143,6 +143,7 @@ public void TestQpidJmsTypes()
                 ["f"] = (float)123,  // 2+5
                 ["l"] = (long)123, // 2+9
                 ["s"] = (short)123, // 2+2
+                ["u"] = (ushort)123,
                 ["t"] = true // 2+2
             };
             byte[] xbytes = { 0xaa, 0x55 };
@@ -159,6 +160,7 @@ public void TestQpidJmsTypes()
             Assert.Equal(typeof(float), nt["f"].GetType()); Assert.Equal((float)123, nt["f"]);
             Assert.Equal(typeof(long), nt["l"].GetType()); Assert.Equal((long)123, nt["l"]);
             Assert.Equal(typeof(short), nt["s"].GetType()); Assert.Equal((short)123, nt["s"]);
+            Assert.Equal(typeof(ushort), nt["u"].GetType()); Assert.Equal((ushort)123, nt["u"]);
             Assert.Equal(true, nt["t"]);
             Assert.Equal(xbytes, ((BinaryTableValue)nt["x"]).Bytes);
             Assert.Null(nt["V"]);

projects/Unit/TestFieldTableFormattingGeneric.cs

@@ -131,6 +131,7 @@ public void TestQpidJmsTypes()
                 ["f"] = (float)123,
                 ["l"] = (long)123,
                 ["s"] = (short)123,
+                ["u"] = (ushort)123,
                 ["t"] = true
             };
             byte[] xbytes = new byte[] { 0xaa, 0x55 };
@@ -147,6 +148,7 @@ public void TestQpidJmsTypes()
             Assert.Equal(typeof(float), nt["f"].GetType()); Assert.Equal((float)123, nt["f"]);
             Assert.Equal(typeof(long), nt["l"].GetType()); Assert.Equal((long)123, nt["l"]);
             Assert.Equal(typeof(short), nt["s"].GetType()); Assert.Equal((short)123, nt["s"]);
+            Assert.Equal(typeof(ushort), nt["u"].GetType()); Assert.Equal((ushort)123, nt["u"]);
             Assert.Equal(true, nt["t"]);
             Assert.Equal(xbytes, ((BinaryTableValue)nt["x"]).Bytes);
             Assert.Null(nt["V"]);