Merge branch 'master' of https://github.com/dotnetcore/WebApiClient

Author: xljiulang

WebApiClientCore.Extensions.SourceGenerator/DependencyInjection/WebApiClientBuilderExtensions.cs

@@ -1,4 +1,5 @@
-using WebApiClientCore;
+using Microsoft.Extensions.DependencyInjection.Extensions;
+using WebApiClientCore;
 using WebApiClientCore.Implementations;
 
 namespace Microsoft.Extensions.DependencyInjection
@@ -21,7 +22,8 @@ public static class WebApiClientBuilderExtensions
         /// <returns></returns>
         public static IWebApiClientBuilder UseSourceGeneratorHttpApiActivator(this IWebApiClientBuilder builder)
         {
-            builder.Services.AddSingleton(typeof(IHttpApiActivator<>), typeof(SourceGeneratorHttpApiActivator<>));
+            var descriptor = ServiceDescriptor.Singleton(typeof(IHttpApiActivator<>), typeof(SourceGeneratorHttpApiActivator<>));
+            builder.Services.Replace(descriptor);
             return builder;
         }
     }

WebApiClientCore/Serialization/JsonConverters/JsonStringTypeConverter.cs

@@ -54,7 +54,7 @@ public override TJsonString Read(ref Utf8JsonReader reader, Type typeToConvert,
             {
                 var json = reader.GetString();
                 var valueType = typeToConvert.GenericTypeArguments.First();
-                var value = JsonSerializer.Deserialize(json, valueType, options);
+                var value = string.IsNullOrEmpty(json) ? null : JsonSerializer.Deserialize(json, valueType, options);
                 return typeToConvert.CreateInstance<TJsonString>(value);
             }