Merge pull request MessagePack-CSharp#1277 from seriousbox/fix-int-ke…

…y-constructor-matching Updating constructor matching for int keys
codewriter-packages · Jul 14, 2021 · 1551f93 · 1551f93
2 parents 15d6851 + c2a7583
commit 1551f93
Show file tree

Hide file tree

Showing 2 changed files with 43 additions and 6 deletions.
diff --git a/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Resolvers/DynamicObjectResolver.cs b/src/MessagePack.UnityClient/Assets/Scripts/MessagePack/Resolvers/DynamicObjectResolver.cs
@@ -1787,6 +1787,7 @@ public static ObjectSerializationInfo CreateOrNull(Type type, bool forceStringKe
             var constructorParameters = new List<EmittableMemberAndConstructorParameter>();
             if (ctor != null)
             {
+                IReadOnlyDictionary<int, EmittableMember> ctorParamIndexIntMembersDictionary = intMembers.OrderBy(x => x.Key).Select((x, i) => (Key: x.Value, Index: i)).ToDictionary(x => x.Index, x => x.Key);
                 ILookup<string, KeyValuePair<string, EmittableMember>> constructorLookupByKeyDictionary = stringMembers.ToLookup(x => x.Key, x => x, StringComparer.OrdinalIgnoreCase);
                 ILookup<string, KeyValuePair<string, EmittableMember>> constructorLookupByMemberNameDictionary = stringMembers.ToLookup(x => x.Value.Name, x => x, StringComparer.OrdinalIgnoreCase);
                 do
@@ -1798,7 +1799,7 @@ public static ObjectSerializationInfo CreateOrNull(Type type, bool forceStringKe
                         EmittableMember paramMember;
                         if (isIntKey)
                         {
-                            if (intMembers.TryGetValue(ctorParamIndex, out paramMember))
+                            if (ctorParamIndexIntMembersDictionary.TryGetValue(ctorParamIndex, out paramMember))
                             {
                                 if ((item.ParameterType == paramMember.Type ||
                                     item.ParameterType.GetTypeInfo().IsAssignableFrom(paramMember.Type))
@@ -1811,7 +1812,7 @@ public static ObjectSerializationInfo CreateOrNull(Type type, bool forceStringKe
                                     if (ctorEnumerator != null)
                                     {
                                         ctor = null;
-                                        continue;
+                                        break;
                                     }
                                     else
                                     {
@@ -1824,7 +1825,7 @@ public static ObjectSerializationInfo CreateOrNull(Type type, bool forceStringKe
                                 if (ctorEnumerator != null)
                                 {
                                     ctor = null;
-                                    continue;
+                                    break;
                                 }
                                 else
                                 {
@@ -1857,7 +1858,7 @@ public static ObjectSerializationInfo CreateOrNull(Type type, bool forceStringKe
                                     if (ctorEnumerator != null)
                                     {
                                         ctor = null;
-                                        continue;
+                                        break;
                                     }
                                     else
                                     {
@@ -1875,7 +1876,7 @@ public static ObjectSerializationInfo CreateOrNull(Type type, bool forceStringKe
                                     if (ctorEnumerator != null)
                                     {
                                         ctor = null;
-                                        continue;
+                                        break;
                                     }
                                     else
                                     {
@@ -1888,7 +1889,7 @@ public static ObjectSerializationInfo CreateOrNull(Type type, bool forceStringKe
                                 if (ctorEnumerator != null)
                                 {
                                     ctor = null;
-                                    continue;
+                                    break;
                                 }
                                 else
                                 {

diff --git a/...ePack.UnityClient/Assets/Scripts/Tests/ShareTests/DynamicObjectResolverConstructorTest.cs b/...ePack.UnityClient/Assets/Scripts/Tests/ShareTests/DynamicObjectResolverConstructorTest.cs
@@ -255,6 +255,30 @@ public TestConstructor9(int x, int y, int z)
             }
         }
 
+        /// <summary>
+        /// This constructor tests the case where there are missing int keys, to ensure that
+        /// the correct ctor is still found using index numbers of the keys, not their values.
+        /// </summary>
+        [MessagePackObject]
+        public class TestConstructor10
+        {
+            [Key(0)]
+            public int X { get; }
+
+            [Key(2)]
+            public int Y { get; }
+
+            [Key(5)]
+            public int Z { get; }
+
+            public TestConstructor10(int x, int y, int z)
+            {
+                X = x;
+                Y = y;
+                Z = z;
+            }
+        }
+
         [Fact]
         public void StringKey()
         {
@@ -350,5 +374,17 @@ public void MatchedStructCtorFoundWithMixOfMemberNamesAndStringKeys()
             r.Y.Is(8);
             r.Z.Is(9);
         }
+
+        [Fact]
+        public void MatchedClassCtorFoundWithMissingIntKeys()
+        {
+            var ctor = new TestConstructor10(10, 11, 12);
+            var bin = MessagePackSerializer.Serialize(ctor);
+            var r = MessagePackSerializer.Deserialize<TestConstructor10>(bin);
+
+            r.X.Is(10);
+            r.Y.Is(11);
+            r.Z.Is(12);
+        }
     }
 }