chore: code cleanup, reduce nestings, use TryGetValue, remove unnee…

…ded `ToArray` call
reactiveui · Nov 13, 2023 · d583996 · d583996
1 parent e726d19
commit d583996
Show file tree

Hide file tree

Showing 29 changed files with 133 additions and 227 deletions.
diff --git a/Refit.Tests/MethodOverloads.cs b/Refit.Tests/MethodOverloads.cs
@@ -45,7 +45,7 @@ public interface IUseOverloadedGenericMethods<TResponse, in TParam, in THeader>
     }
 
 
-    public class MethodOverladTests
+    public class MethodOverloadTests
     {
         [Fact]
         public async Task BasicMethodOverloadTest()

diff --git a/Refit/AnonymousDisposable.cs b/Refit/AnonymousDisposable.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Refit
+namespace Refit
 {
     sealed class AnonymousDisposable : IDisposable
     {

diff --git a/Refit/ApiException.cs b/Refit/ApiException.cs
@@ -1,8 +1,6 @@
-using System;
-using System.Net;
+using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
-using System.Threading.Tasks;
 
 namespace Refit
 {
@@ -134,15 +132,15 @@ public static async Task<ApiException> Create(string exceptionMessage, HttpReque
 
                 if (response.Content.Headers?.ContentType?.MediaType?.Equals("application/problem+json") ?? false)
                 {
-                    exception = ValidationApiException.Create(exception);                    
+                    exception = ValidationApiException.Create(exception);
                 }
 
                 response.Content.Dispose();
             }
             catch
             {
-                // NB: We're already handling an exception at this point, 
-                // so we want to make sure we don't throw another one 
+                // NB: We're already handling an exception at this point,
+                // so we want to make sure we don't throw another one
                 // that hides the real error.
             }
 

diff --git a/Refit/ApiResponse.cs b/Refit/ApiResponse.cs
@@ -1,9 +1,7 @@
-using System;
-using System.Diagnostics.CodeAnalysis;
+using System.Diagnostics.CodeAnalysis;
 using System.Net;
 using System.Net.Http;
 using System.Net.Http.Headers;
-using System.Threading.Tasks;
 
 namespace Refit
 {

diff --git a/Refit/Attributes.cs b/Refit/Attributes.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Net.Http;
+using System.Net.Http;
 
 namespace Refit
 {

diff --git a/Refit/AuthenticatedHttpClientHandler.cs b/Refit/AuthenticatedHttpClientHandler.cs
@@ -1,8 +1,5 @@
-using System;
-using System.Net.Http;
+using System.Net.Http;
 using System.Net.Http.Headers;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace Refit
 {

diff --git a/Refit/Buffers/PooledBufferWriter.Stream.cs b/Refit/Buffers/PooledBufferWriter.Stream.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Buffers;
-using System.IO;
-using System.Threading;
-using System.Threading.Tasks;
+using System.Buffers;
 
 #nullable enable
 

diff --git a/Refit/Buffers/PooledBufferWriter.ThrowExceptions.cs b/Refit/Buffers/PooledBufferWriter.ThrowExceptions.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Runtime.CompilerServices;
+using System.Runtime.CompilerServices;
 
 namespace Refit.Buffers
 {

diff --git a/Refit/Buffers/PooledBufferWriter.cs b/Refit/Buffers/PooledBufferWriter.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Buffers;
-using System.IO;
+using System.Buffers;
 using System.Runtime.CompilerServices;
 
 namespace Refit.Buffers

diff --git a/Refit/CachedRequestBuilderImplementation.cs b/Refit/CachedRequestBuilderImplementation.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Concurrent;
-using System.Linq;
+using System.Collections.Concurrent;
 using System.Net.Http;
 
 namespace Refit
@@ -40,7 +38,7 @@ static string GetCacheKey(string methodName, Type[] parameterTypes, Type[] gener
 
         static string GetArgumentString(Type[] parameterTypes)
         {
-            if (parameterTypes == null || parameterTypes.Length == 0)
+            if (parameterTypes.Length == 0)
             {
                 return "";
             }
@@ -50,7 +48,7 @@ static string GetArgumentString(Type[] parameterTypes)
 
         static string GetGenericString(Type[] genericArgumentTypes)
         {
-            if (genericArgumentTypes == null || genericArgumentTypes.Length == 0)
+            if (genericArgumentTypes.Length == 0)
             {
                 return "";
             }

diff --git a/Refit/CloseGenericMethodKey.cs b/Refit/CloseGenericMethodKey.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Linq;
-using System.Reflection;
+using System.Reflection;
 
 namespace Refit
 {

diff --git a/Refit/FormValueMultimap.cs b/Refit/FormValueMultimap.cs
@@ -1,9 +1,5 @@
-using System;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
+using System.Collections;
 using System.Reflection;
-using System.Text.Json.Serialization;
 
 namespace Refit
 {
@@ -47,62 +43,62 @@ public FormValueMultimap(object source, RefitSettings settings)
 
             lock (PropertyCache)
             {
-                if (!PropertyCache.ContainsKey(type))
+                if (!PropertyCache.TryGetValue(type, out var properties))
                 {
-                    PropertyCache[type] = GetProperties(type);
+                    properties = GetProperties(type);
+                    PropertyCache[type] = properties;
                 }
 
-                foreach (var property in PropertyCache[type])
+                foreach (var property in properties)
                 {
                     var value = property.GetValue(source, null);
-                    if (value != null)
-                    {
-                        var fieldName = GetFieldNameForProperty(property);
+                    if (value == null) continue;
+
+                    var fieldName = GetFieldNameForProperty(property);
 
-                        // see if there's a query attribute
-                        var attrib = property.GetCustomAttribute<QueryAttribute>(true);
+                    // see if there's a query attribute
+                    var attrib = property.GetCustomAttribute<QueryAttribute>(true);
+
+                    if (value is not IEnumerable enumerable)
+                    {
+                        Add(fieldName, settings.FormUrlEncodedParameterFormatter.Format(value, attrib?.Format));
+                        continue;
+                    }
 
-                        if (value is IEnumerable enumerable)
-                        {
-                            var collectionFormat = attrib != null && attrib.IsCollectionFormatSpecified
-                                ? attrib.CollectionFormat
-                                : settings.CollectionFormat;
+                    var collectionFormat = attrib is { IsCollectionFormatSpecified: true }
+                        ? attrib.CollectionFormat
+                        : settings.CollectionFormat;
 
-                            switch (collectionFormat)
+                    switch (collectionFormat)
+                    {
+                        case CollectionFormat.Multi:
+                            foreach (var item in enumerable)
                             {
-                                case CollectionFormat.Multi:
-                                    foreach (var item in enumerable)
-                                    {
-                                        Add(fieldName, settings.FormUrlEncodedParameterFormatter.Format(item, attrib?.Format));
-                                    }
-                                    break;
-                                case CollectionFormat.Csv:
-                                case CollectionFormat.Ssv:
-                                case CollectionFormat.Tsv:
-                                case CollectionFormat.Pipes:
-                                    var delimiter = collectionFormat switch
-                                    {
-                                        CollectionFormat.Csv => ",",
-                                        CollectionFormat.Ssv => " ",
-                                        CollectionFormat.Tsv => "\t",
-                                        _ => "|"
-                                    };
-
-                                    var formattedValues = enumerable
-                                        .Cast<object>()
-                                        .Select(v => settings.FormUrlEncodedParameterFormatter.Format(v, attrib?.Format));
-                                    Add(fieldName, string.Join(delimiter, formattedValues));
-                                    break;
-                                default:
-                                    Add(fieldName, settings.FormUrlEncodedParameterFormatter.Format(value, attrib?.Format));
-                                    break;
+                                Add(fieldName,
+                                    settings.FormUrlEncodedParameterFormatter.Format(item, attrib?.Format));
                             }
-                        }
-                        else
-                        {
-                            Add(fieldName, settings.FormUrlEncodedParameterFormatter.Format(value, attrib?.Format));
-                        }
 
+                            break;
+                        case CollectionFormat.Csv:
+                        case CollectionFormat.Ssv:
+                        case CollectionFormat.Tsv:
+                        case CollectionFormat.Pipes:
+                            var delimiter = collectionFormat switch
+                            {
+                                CollectionFormat.Csv => ",",
+                                CollectionFormat.Ssv => " ",
+                                CollectionFormat.Tsv => "\t",
+                                _ => "|"
+                            };
+
+                            var formattedValues = enumerable
+                                .Cast<object>()
+                                .Select(v => settings.FormUrlEncodedParameterFormatter.Format(v, attrib?.Format));
+                            Add(fieldName, string.Join(delimiter, formattedValues));
+                            break;
+                        default:
+                            Add(fieldName, settings.FormUrlEncodedParameterFormatter.Format(value, attrib?.Format));
+                            break;
                     }
                 }
             }

diff --git a/Refit/HttpContentExtensions.cs b/Refit/HttpContentExtensions.cs
@@ -1,11 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.IO;
-using System.Linq;
-using System.Net.Http;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
+using System.Net.Http;
 
 namespace Refit
 {

diff --git a/Refit/JsonContentSerializer.cs b/Refit/JsonContentSerializer.cs
@@ -1,10 +1,5 @@
-using System;
-using System.IO;
-using System.Net.Http;
+using System.Net.Http;
 using System.Reflection;
-using System.Text;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace Refit
 {

diff --git a/Refit/MultipartItem.cs b/Refit/MultipartItem.cs
@@ -1,6 +1,4 @@
-using System;
-using System.IO;
-using System.Net.Http;
+using System.Net.Http;
 using System.Net.Http.Headers;
 
 namespace Refit

diff --git a/Refit/NameValueCollection.cs b/Refit/NameValueCollection.cs
@@ -1,7 +1,4 @@
-using System.Collections.Generic;
-using System.Linq;
-
-namespace System.Collections.Specialized
+namespace System.Collections.Specialized
 {
     class NameValueCollection : Dictionary<string, string>
     {

diff --git a/Refit/ProblemDetails.cs b/Refit/ProblemDetails.cs
@@ -1,6 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Text.Json.Serialization;
+using System.Text.Json.Serialization;
 
 namespace Refit
 {

diff --git a/Refit/PushStreamContent.cs b/Refit/PushStreamContent.cs
@@ -21,10 +21,7 @@
 
 using System.Diagnostics.CodeAnalysis;
 using System.Diagnostics.Contracts;
-using System.IO;
 using System.Net.Http.Headers;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace System.Net.Http
 {

diff --git a/Refit/RefitSettings.cs b/Refit/RefitSettings.cs
@@ -1,13 +1,8 @@
-using System;
-using System.Collections.Concurrent;
-using System.Collections.Generic;
+using System.Collections.Concurrent;
 using System.Globalization;
-using System.Linq;
 using System.Net.Http;
 using System.Reflection;
 using System.Runtime.Serialization;
-using System.Threading;
-using System.Threading.Tasks;
 
 namespace Refit
 {
@@ -86,7 +81,7 @@ public RefitSettings(
         public bool Buffered { get; set; } = false;
 
         /// <summary>
-        /// Optional Key-Value pairs, which are displayed in the property <see cref="HttpRequestMessage.Options"/> or <see cref="HttpRequestMessage.Properties"/>. 
+        /// Optional Key-Value pairs, which are displayed in the property <see cref="HttpRequestMessage.Options"/> or <see cref="HttpRequestMessage.Properties"/>.
         /// </summary>
         public Dictionary<string, object> HttpRequestMessageOptions { get; set; }
     }

diff --git a/Refit/RequestBuilder.cs b/Refit/RequestBuilder.cs
@@ -1,5 +1,4 @@
-using System;
-using System.Net.Http;
+using System.Net.Http;
 
 namespace Refit
 {

diff --git a/Refit/RequestBuilderFactory.cs b/Refit/RequestBuilderFactory.cs
@@ -1,6 +1,4 @@
-using System;
-
-namespace Refit
+namespace Refit
 {
     interface IRequestBuilderFactory
     {

diff --git a/Refit/RequestBuilderImplementation.TaskToObservable.cs b/Refit/RequestBuilderImplementation.TaskToObservable.cs
@@ -1,8 +1,4 @@
-using System;
-using System.Threading;
-using System.Threading.Tasks;
-
-namespace Refit
+namespace Refit
 {
     partial class RequestBuilderImplementation
     {
-Original file line number
+Diff line change
@@ Expand Up @@
         }
-        public class MethodOverladTests
+        public class MethodOverloadTests
         {
             [Fact]
             public async Task BasicMethodOverloadTest()
@@ Expand Down @@