Refactor and improvements.

src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/DynamicProxying/DynamicHttpProxyInterceptor.cs

@@ -31,7 +31,7 @@ namespace Volo.Abp.Http.Client.DynamicProxying
         {
             GenericInterceptAsyncMethod = typeof(DynamicHttpProxyInterceptor<TService>)
                 .GetMethods(BindingFlags.NonPublic | BindingFlags.Instance)
-                .First(m => m.Name == nameof(InterceptAsync) && m.IsGenericMethodDefinition);
+                .First(m => m.Name == nameof(MakeRequestAndGetResultAsync) && m.IsGenericMethodDefinition);
         }
 
         public DynamicHttpProxyInterceptor(
@@ -48,9 +48,17 @@ namespace Volo.Abp.Http.Client.DynamicProxying
 
         public override void Intercept(IAbpMethodInvocation invocation)
         {
-            //TODO: Handle this differently because InterceptAsync assumes that given method is async!
+            if (invocation.Method.ReturnType == typeof(void))
-
+            {
-            AsyncHelper.RunSync(() => InterceptAsync(invocation));
+                AsyncHelper.RunSync(() => MakeRequest(invocation));
+            }
+            else
+            {
+                invocation.ReturnValue = _jsonSerializer.Deserialize(
+                    invocation.Method.ReturnType,
+                    AsyncHelper.RunSync(() => MakeRequest(invocation))
+                );
+            }
         }
 
         public override Task InterceptAsync(IAbpMethodInvocation invocation)
@@ -67,19 +75,9 @@ namespace Volo.Abp.Http.Client.DynamicProxying
             return Task.CompletedTask;
         }
 
-        private async Task<T> InterceptAsync<T>(IAbpMethodInvocation invocation)
+        private async Task<T> MakeRequestAndGetResultAsync<T>(IAbpMethodInvocation invocation)
-        {
-            var content = await MakeRequest(invocation);
-
-            var result = JsonConvert.DeserializeObject(
-                content,
-                typeof(T),
-                new JsonSerializerSettings
         {
-                    ContractResolver = new CamelCasePropertyNamesContractResolver()
+            return _jsonSerializer.Deserialize<T>(await MakeRequest(invocation));
-                });
-
-            return (T)result;
         }
 
         private async Task<string> MakeRequest(IAbpMethodInvocation invocation)

src/Volo.Abp/Volo/Abp/Json/IJsonSerializer.cs

@@ -1,9 +1,13 @@
-namespace Volo.Abp.Json
+using System;
+
+namespace Volo.Abp.Json
 {
     public interface IJsonSerializer
     {
         string Serialize(object obj, bool camelCase = true, bool indented = false);
 
-        T Deserialize<T>(string jsonString);
+        T Deserialize<T>(string jsonString, bool camelCase = true);
+
+        object Deserialize(Type type, string jsonString, bool camelCase = true);
     }
 }

src/Volo.Abp/Volo/Abp/Json/Newtonsoft/NewtonsoftJsonSerializer.cs

@@ -1,3 +1,4 @@
+using System;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Serialization;
 using Volo.Abp.DependencyInjection;
@@ -13,33 +14,38 @@ namespace Volo.Abp.Json.Newtonsoft
             _dateTimeConverter = dateTimeConverter;
         }
 
-        public string Serialize(object obj, bool camelCase = false, bool indented = false)
+        public string Serialize(object obj, bool camelCase = true, bool indented = false)
         {
-            var serializerSettings = CreateDefaultSerializerSettings();
+            return JsonConvert.SerializeObject(obj, CreateSerializerSettings(camelCase, indented));
-            
-            if (camelCase)
-            {
-                serializerSettings.ContractResolver = new CamelCasePropertyNamesContractResolver();
         }
 
-            if (indented)
+        public T Deserialize<T>(string jsonString, bool camelCase = true)
         {
-                serializerSettings.Formatting = Formatting.Indented;
+            return JsonConvert.DeserializeObject<T>(jsonString, CreateSerializerSettings(camelCase));
         }
 
-            return JsonConvert.SerializeObject(obj, serializerSettings);
+        public object Deserialize(Type type, string jsonString, bool camelCase = true)
+        {
+            return JsonConvert.DeserializeObject(jsonString, type, CreateSerializerSettings(camelCase));
         }
 
-        protected virtual JsonSerializerSettings CreateDefaultSerializerSettings()
+        protected virtual JsonSerializerSettings CreateSerializerSettings(bool camelCase = true, bool indented = false)
         {
             var settings = new JsonSerializerSettings();
+
             settings.Converters.Insert(0, _dateTimeConverter);
-            return settings;
+            
+            if (camelCase)
+            {
+                settings.ContractResolver = new CamelCasePropertyNamesContractResolver();
             }
 
-        public T Deserialize<T>(string jsonString)
+            if (indented)
             {
-            return JsonConvert.DeserializeObject<T>(jsonString);
+                settings.Formatting = Formatting.Indented;
+            }
+            
+            return settings;
         }
     }
 }