diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Http/IObjectToFormData.cs b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/IObjectToFormData.cs similarity index 83% rename from framework/src/Volo.Abp.Core/Volo/Abp/Http/IObjectToFormData.cs rename to framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/IObjectToFormData.cs index 166b51239e..5aec4252e3 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Http/IObjectToFormData.cs +++ b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/IObjectToFormData.cs @@ -2,7 +2,7 @@ using System.Net.Http; using System.Threading.Tasks; -namespace Volo.Abp.Http +namespace Volo.Abp.Http.Client.ClientProxying { public interface IObjectToFormData { diff --git a/framework/src/Volo.Abp.Core/Volo/Abp/Http/IObjectToQueryString.cs b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/IObjectToQueryString.cs similarity index 76% rename from framework/src/Volo.Abp.Core/Volo/Abp/Http/IObjectToQueryString.cs rename to framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/IObjectToQueryString.cs index 19696e546c..ef223a903d 100644 --- a/framework/src/Volo.Abp.Core/Volo/Abp/Http/IObjectToQueryString.cs +++ b/framework/src/Volo.Abp.Http.Client/Volo/Abp/Http/Client/ClientProxying/IObjectToQueryString.cs @@ -1,6 +1,6 @@ using System.Threading.Tasks; -namespace Volo.Abp.Http +namespace Volo.Abp.Http.Client.ClientProxying { public interface IObjectToQueryString { diff --git a/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/TestObjectToFormData.cs b/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/TestObjectToFormData.cs new file mode 100644 index 0000000000..a82923c0ac --- /dev/null +++ b/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/TestObjectToFormData.cs @@ -0,0 +1,31 @@ +using System.Collections.Generic; +using System.Net.Http; +using System.Text; +using System.Threading.Tasks; +using Volo.Abp.DependencyInjection; +using Volo.Abp.Http.Client.ClientProxying; +using Volo.Abp.TestApp.Application.Dto; + +namespace Volo.Abp.Http.DynamicProxying +{ + [ExposeServices(typeof(IObjectToFormData>))] + public class TestObjectToFormData : IObjectToFormData>, ITransientDependency + { + public Task>> ConvertAsync(List values) + { + if (values.IsNullOrEmpty()) + { + return null; + } + + var formDataContents = new List>(); + for (var i = 0; i < values.Count; i++) + { + formDataContents.Add(new KeyValuePair($"NameValues[{i}].Name", new StringContent(values[i].Name, Encoding.UTF8))); + formDataContents.Add(new KeyValuePair($"NameValues[{i}].Value", new StringContent(values[i].Value, Encoding.UTF8))); + } + + return Task.FromResult(formDataContents); + } + } +} diff --git a/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/TestObjectToQueryString.cs b/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/TestObjectToQueryString.cs new file mode 100644 index 0000000000..13c470666a --- /dev/null +++ b/framework/test/Volo.Abp.Http.Client.Tests/Volo/Abp/Http/DynamicProxying/TestObjectToQueryString.cs @@ -0,0 +1,31 @@ +using System.Collections.Generic; +using System.Text; +using System.Threading.Tasks; +using Volo.Abp.DependencyInjection; +using Volo.Abp.Http.Client.ClientProxying; +using Volo.Abp.TestApp.Application.Dto; + +namespace Volo.Abp.Http.DynamicProxying +{ + [ExposeServices(typeof(IObjectToQueryString>))] + public class TestObjectToQueryString : IObjectToQueryString>, ITransientDependency + { + public Task ConvertAsync(List values) + { + if (values.IsNullOrEmpty()) + { + return null; + } + + var sb = new StringBuilder(); + + for (var i = 0; i < values.Count; i++) + { + sb.Append($"NameValues[{i}].Name={values[i].Name}&NameValues[{i}].Value={values[i].Value}&"); + } + + sb.Remove(sb.Length - 1, 1); + return Task.FromResult(sb.ToString()); + } + } +} diff --git a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/Dto/GetParamsInput.cs b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/Dto/GetParamsInput.cs index 3cbb1d4794..93a643491c 100644 --- a/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/Dto/GetParamsInput.cs +++ b/framework/test/Volo.Abp.TestApp/Volo/Abp/TestApp/Application/Dto/GetParamsInput.cs @@ -1,9 +1,4 @@ using System.Collections.Generic; -using System.Net.Http; -using System.Text; -using System.Threading.Tasks; -using Volo.Abp.DependencyInjection; -using Volo.Abp.Http; namespace Volo.Abp.TestApp.Application.Dto { @@ -20,47 +15,4 @@ namespace Volo.Abp.TestApp.Application.Dto public string Value { get; set; } } - - [ExposeServices(typeof(IObjectToQueryString>))] - public class TestObjectToQueryString : IObjectToQueryString>, ITransientDependency - { - public Task ConvertAsync(List values) - { - if (values.IsNullOrEmpty()) - { - return null; - } - - var sb = new StringBuilder(); - - for (var i = 0; i < values.Count; i++) - { - sb.Append($"NameValues[{i}].Name={values[i].Name}&NameValues[{i}].Value={values[i].Value}&"); - } - - sb.Remove(sb.Length - 1, 1); - return Task.FromResult(sb.ToString()); - } - } - - [ExposeServices(typeof(IObjectToFormData>))] - public class TestObjectToFormData : IObjectToFormData>, ITransientDependency - { - public Task>> ConvertAsync(List values) - { - if (values.IsNullOrEmpty()) - { - return null; - } - - var formDataContents = new List>(); - for (var i = 0; i < values.Count; i++) - { - formDataContents.Add(new KeyValuePair($"NameValues[{i}].Name", new StringContent(values[i].Name, Encoding.UTF8))); - formDataContents.Add(new KeyValuePair($"NameValues[{i}].Value", new StringContent(values[i].Value, Encoding.UTF8))); - } - - return Task.FromResult(formDataContents); - } - } }