Merge pull request #261 from graphql-dotnet/230-argumentoutofrange-ex…

…ception-with-systemtextjson Migitate ArgumentOutOfRangeException with SystemTextJson
graphql-dotnet · Aug 15, 2020 · 46073f0 · 46073f0
2 parents 812a740 + 73ce1f2
commit 46073f0
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 28 deletions.
diff --git a/src/GraphQL.Client.Serializer.SystemTextJson/ImmutableConverter.cs b/src/GraphQL.Client.Serializer.SystemTextJson/ImmutableConverter.cs
@@ -32,21 +32,13 @@ public override bool CanConvert(Type typeToConvert)
             {
                 var constructor = constructors[0];
                 var parameters = constructor.GetParameters();
-                var hasParameters = parameters.Length > 0;
-                if (hasParameters)
+
+                if (parameters.Length > 0)
                 {
                     var properties = typeToConvert.GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic);
-                    result = true;
-                    foreach (var parameter in parameters)
-                    {
-                        var hasMatchingProperty = properties.Any(p =>
-                                                                     NameOfPropertyAndParameter.Matches(p.Name, parameter.Name, typeToConvert.IsAnonymous()));
-                        if (!hasMatchingProperty)
-                        {
-                            result = false;
-                            break;
-                        }
-                    }
+                    result = parameters
+                        .Select(parameter => properties.Any(p => NameOfPropertyAndParameter.Matches(p.Name, parameter.Name, typeToConvert.IsAnonymous())))
+                        .All(hasMatchingProperty => hasMatchingProperty);
                 }
                 else
                 {
@@ -69,8 +61,8 @@ public override object Read(ref Utf8JsonReader reader, Type typeToConvert, JsonS
                     break;
                 }
 
-                var jsonPropName = reader.GetString();
-                var normalizedPropName = ConvertAndNormalizeName(jsonPropName, options);
+                string jsonPropName = reader.GetString();
+                string normalizedPropName = ConvertAndNormalizeName(jsonPropName, options);
                 if (!namedPropertiesMapping.TryGetValue(normalizedPropName, out var obProp))
                 {
                     reader.Read();
@@ -86,7 +78,7 @@ public override object Read(ref Utf8JsonReader reader, Type typeToConvert, JsonS
             var ctor = typeToConvert.GetConstructors(BindingFlags.Public | BindingFlags.Instance).First();
             var parameters = ctor.GetParameters();
             var parameterValues = new object[parameters.Length];
-            for (var index = 0; index < parameters.Length; index++)
+            for (int index = 0; index < parameters.Length; index++)
             {
                 var parameterInfo = parameters[index];
                 var value = valueOfProperty.First(prop =>
@@ -142,7 +134,7 @@ private static IReadOnlyDictionary<string, PropertyInfo> GetNamedProperties(Json
                     name = options.PropertyNamingPolicy?.ConvertName(property.Name) ?? property.Name;
                 }
 
-                var normalizedName = NormalizeName(name, options);
+                string normalizedName = NormalizeName(name, options);
                 result.Add(normalizedName, property);
             }
 
@@ -151,8 +143,8 @@ private static IReadOnlyDictionary<string, PropertyInfo> GetNamedProperties(Json
 
         private static string ConvertAndNormalizeName(string name, JsonSerializerOptions options)
         {
-            var convertedName = options.PropertyNamingPolicy?.ConvertName(name) ?? name;
-            return options.PropertyNameCaseInsensitive ? convertedName.ToLowerInvariant() : convertedName;
+            string convertedName = options.PropertyNamingPolicy?.ConvertName(name) ?? name;
+            return NormalizeName(convertedName, options);
         }
 
         private static string NormalizeName(string name, JsonSerializerOptions options) => options.PropertyNameCaseInsensitive ? name.ToLowerInvariant() : name;
@@ -162,12 +154,12 @@ internal static class NameOfPropertyAndParameter
     {
         public static bool Matches(string propertyName, string parameterName, bool anonymousType)
         {
-            if (propertyName is null && parameterName is null)
+            if (string.IsNullOrEmpty(propertyName))
             {
-                return true;
+                return string.IsNullOrEmpty(parameterName);
             }
 
-            if (propertyName is null || parameterName is null)
+            if (string.IsNullOrEmpty(parameterName))
             {
                 return false;
             }
@@ -176,12 +168,10 @@ public static bool Matches(string propertyName, string parameterName, bool anony
             {
                 return propertyName.Equals(parameterName, StringComparison.Ordinal);
             }
-            else
-            {
-                var xRight = propertyName.AsSpan(1);
-                var yRight = parameterName.AsSpan(1);
-                return char.ToLowerInvariant(propertyName[0]).CompareTo(parameterName[0]) == 0 && xRight.Equals(yRight, StringComparison.Ordinal);
-            }
+
+            var xRight = propertyName.AsSpan(1);
+            var yRight = parameterName.AsSpan(1);
+            return char.ToLowerInvariant(propertyName[0]).CompareTo(parameterName[0]) == 0 && xRight.Equals(yRight, StringComparison.Ordinal);
         }
     }
 

diff --git a/tests/GraphQL.Client.Serializer.Tests/TestData/DeserializeResponseTestData.cs b/tests/GraphQL.Client.Serializer.Tests/TestData/DeserializeResponseTestData.cs
@@ -99,6 +99,21 @@ public IEnumerator<object[]> GetEnumerator()
                         }
                     })
             };
+
+            // add test for github issue #230 : https://github.com/graphql-dotnet/graphql-client/issues/230
+            yield return new object[] {
+                "{\"data\":{\"getMyModelType\":{\"id\":\"foo\",\"title\":\"The best Foo movie!\"}}}",
+                new GraphQLResponse<GetMyModelTypeResponse> {
+                    Data = new GetMyModelTypeResponse
+                    {
+                        getMyModelType = new Movie
+                        {
+                            id = "foo",
+                            title = "The best Foo movie!"
+                        }
+                    },
+                }
+            };
         }
 
         IEnumerator IEnumerable.GetEnumerator() => GetEnumerator();
@@ -112,4 +127,16 @@ public class Friend
         public string Id { get; set; }
         public string? Name { get; set; }
     }
+
+    public class GetMyModelTypeResponse
+    {
+        //--- Properties ---
+        public Movie getMyModelType { get; set; }
+    }
+    public class Movie
+    {
+        //--- Properties ---
+        public string id { get; set; }
+        public string title { get; set; }
+    }
 }