Merge pull request #1271 from gytsen/6.x

fix: add unsigned short support in table protocol

Author: lukebakken

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

@@ -152,6 +152,9 @@ public static object ReadFieldValue(ReadOnlySpan<byte> span, out int bytesRead)
                 case 's':
                     bytesRead += 2;
                     return NetworkOrderDeserializer.ReadInt16(span.Slice(1));
+                case 'u':
+                    bytesRead += 2;
+                    return NetworkOrderDeserializer.ReadUInt16(span.Slice(1));
                 case 't':
                     bytesRead += 1;
                     return span[1] != 0;
@@ -342,6 +345,10 @@ public static int WriteFieldValue(Span<byte> span, object value)
                     span[0] = (byte)'s';
                     NetworkOrderSerializer.WriteInt16(slice, val);
                     return 3;
+                case ushort val:
+                    span[0] = (byte)'u';
+                    NetworkOrderSerializer.WriteUInt16(slice, val);
+                    return 3;
                 case bool val:
                     span[0] = (byte)'t';
                     span[1] = (byte)(val ? 1 : 0);
@@ -365,6 +372,7 @@ public static int GetFieldValueByteCount(object value)
                 case bool _:
                     return 2;
                 case short _:
+                case ushort _:
                     return 3;
                 case int _:
                 case uint _:

projects/Unit/TestFieldTableFormatting.cs

@@ -144,6 +144,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 };
@@ -160,6 +161,7 @@ public void TestQpidJmsTypes()
             Assert.AreEqual(typeof(float), nt["f"].GetType()); Assert.AreEqual((float)123, nt["f"]);
             Assert.AreEqual(typeof(long), nt["l"].GetType()); Assert.AreEqual((long)123, nt["l"]);
             Assert.AreEqual(typeof(short), nt["s"].GetType()); Assert.AreEqual((short)123, nt["s"]);
+            Assert.AreEqual(typeof(ushort), nt["u"].GetType()); Assert.AreEqual((ushort)123, nt["u"]);
             Assert.AreEqual(true, nt["t"]);
             Assert.AreEqual(xbytes, ((BinaryTableValue)nt["x"]).Bytes);
             Assert.AreEqual(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.AreEqual(typeof(float), nt["f"].GetType()); Assert.AreEqual((float)123, nt["f"]);
             Assert.AreEqual(typeof(long), nt["l"].GetType()); Assert.AreEqual((long)123, nt["l"]);
             Assert.AreEqual(typeof(short), nt["s"].GetType()); Assert.AreEqual((short)123, nt["s"]);
+            Assert.AreEqual(typeof(ushort), nt["u"].GetType()); Assert.AreEqual((ushort)123, nt["u"]);
             Assert.AreEqual(true, nt["t"]);
             Assert.AreEqual(xbytes, ((BinaryTableValue)nt["x"]).Bytes);
             Assert.AreEqual(null, nt["V"]);