Merge branch 'master' into push-to-client-sdks-oss-repos

Author: NRHelmi

DelveClientSDK/GeneratedDelveClient.cs

@@ -194,26 +194,23 @@ protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> Rea
                 }
                 catch (Newtonsoft.Json.JsonException exception)
                 {
-                    var message = "Could not deserialize the response body string as " + typeof(T).FullName + ".";
+                    var message = "Could not deserialize the response body string as " + typeof(T).FullName + "\n response content: " + responseText + ".";
                     throw new ApiException(message, (int)response.StatusCode, responseText, headers, exception);
                 }
             }
             else
             {
+                var responseStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
+                var streamReader = new System.IO.StreamReader(responseStream);
+                var streamText = streamReader.ReadToEnd();
                 try
                 {
-                    using (var responseStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false))
-                    using (var streamReader = new System.IO.StreamReader(responseStream))
-                    using (var jsonTextReader = new Newtonsoft.Json.JsonTextReader(streamReader))
-                    {
-                        var serializer = Newtonsoft.Json.JsonSerializer.Create(JsonSerializerSettings);
-                        var typedBody = serializer.Deserialize<T>(jsonTextReader);
-                        return new ObjectResponseResult<T>(typedBody, string.Empty);
-                    }
+                    var typedBody = Newtonsoft.Json.JsonConvert.DeserializeObject<T>(streamText, JsonSerializerSettings);
+                    return new ObjectResponseResult<T>(typedBody, string.Empty);
                 }
                 catch (Newtonsoft.Json.JsonException exception)
                 {
-                    var message = "Could not deserialize the response body stream as " + typeof(T).FullName + ".";
+                    var message = "Could not deserialize the response body stream as " + typeof(T).FullName + "\n response content: " + streamText  + ".";
                     throw new ApiException(message, (int)response.StatusCode, string.Empty, headers, exception);
                 }
             }

DelveClientSDK/GeneratedDelveCloudClient.cs

@@ -625,26 +625,23 @@ protected virtual async System.Threading.Tasks.Task<ObjectResponseResult<T>> Rea
                 }
                 catch (Newtonsoft.Json.JsonException exception)
                 {
-                    var message = "Could not deserialize the response body string as " + typeof(T).FullName + ".";
+                    var message = "Could not deserialize the response body string as " + typeof(T).FullName + "\n response content: " + responseText + ".";
                     throw new ApiException(message, (int)response.StatusCode, responseText, headers, exception);
                 }
             }
             else
             {
+                var responseStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false);
+                var streamReader = new System.IO.StreamReader(responseStream);
+                var streamText = streamReader.ReadToEnd();
                 try
                 {
-                    using (var responseStream = await response.Content.ReadAsStreamAsync().ConfigureAwait(false))
-                    using (var streamReader = new System.IO.StreamReader(responseStream))
-                    using (var jsonTextReader = new Newtonsoft.Json.JsonTextReader(streamReader))
-                    {
-                        var serializer = Newtonsoft.Json.JsonSerializer.Create(JsonSerializerSettings);
-                        var typedBody = serializer.Deserialize<T>(jsonTextReader);
-                        return new ObjectResponseResult<T>(typedBody, string.Empty);
-                    }
+                    var typedBody = Newtonsoft.Json.JsonConvert.DeserializeObject<T>(streamText, JsonSerializerSettings);
+                    return new ObjectResponseResult<T>(typedBody, string.Empty);
                 }
                 catch (Newtonsoft.Json.JsonException exception)
                 {
-                    var message = "Could not deserialize the response body stream as " + typeof(T).FullName + ".";
+                    var message = "Could not deserialize the response body stream as " + typeof(T).FullName + "\n response content: " + streamText  + ".";
                     throw new ApiException(message, (int)response.StatusCode, string.Empty, headers, exception);
                 }
             }