From 0dab28981bf749fddb17202b46aeb5f12b50770b Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Sat, 16 Feb 2019 16:13:17 -0500 Subject: [PATCH 01/11] Update deps to use latest Roslyn. --- .../InterfaceStubGenerator.App.csproj | 2 +- .../InterfaceStubGenerator.BuildTasks.csproj | 8 ++++---- .../InterfaceStubGenerator.Core.csproj | 9 +++------ Refit/Refit.csproj | 12 ++++++------ Refit/targets/refit.targets | 4 ++-- 5 files changed, 16 insertions(+), 19 deletions(-) diff --git a/InterfaceStubGenerator.App/InterfaceStubGenerator.App.csproj b/InterfaceStubGenerator.App/InterfaceStubGenerator.App.csproj index c9bfb2b9f..ffa9c76cd 100644 --- a/InterfaceStubGenerator.App/InterfaceStubGenerator.App.csproj +++ b/InterfaceStubGenerator.App/InterfaceStubGenerator.App.csproj @@ -2,7 +2,7 @@ Exe - netcoreapp2.1;net46 + netcoreapp2.1;net461 Refit.Generator.App diff --git a/InterfaceStubGenerator.BuildTasks/InterfaceStubGenerator.BuildTasks.csproj b/InterfaceStubGenerator.BuildTasks/InterfaceStubGenerator.BuildTasks.csproj index b7621e057..586fdd2e7 100644 --- a/InterfaceStubGenerator.BuildTasks/InterfaceStubGenerator.BuildTasks.csproj +++ b/InterfaceStubGenerator.BuildTasks/InterfaceStubGenerator.BuildTasks.csproj @@ -1,15 +1,15 @@ - + - net46;netcoreapp2.0 + net461;netcoreapp2.1 Refit.Generator.Tasks ..\buildtask.snk true - - + + diff --git a/InterfaceStubGenerator.Core/InterfaceStubGenerator.Core.csproj b/InterfaceStubGenerator.Core/InterfaceStubGenerator.Core.csproj index 4d00beba7..6197befe9 100644 --- a/InterfaceStubGenerator.Core/InterfaceStubGenerator.Core.csproj +++ b/InterfaceStubGenerator.Core/InterfaceStubGenerator.Core.csproj @@ -1,7 +1,7 @@  - net46;netstandard2.0 + netstandard2.0 Refit.Generator false ..\buildtask.snk @@ -9,11 +9,8 @@ - - - - - + + diff --git a/Refit/Refit.csproj b/Refit/Refit.csproj index cc35f463b..6b0947445 100644 --- a/Refit/Refit.csproj +++ b/Refit/Refit.csproj @@ -28,18 +28,18 @@ - - + + - dotnet publish "$(MSBuildThisFileDirectory)..\InterfaceStubGenerator.BuildTasks\InterfaceStubGenerator.BuildTasks.csproj" -c $(Configuration) -f net46 - dotnet publish "$(MSBuildThisFileDirectory)..\InterfaceStubGenerator.BuildTasks\InterfaceStubGenerator.BuildTasks.csproj" -c $(Configuration) -f netcoreapp2.0 + dotnet publish "$(MSBuildThisFileDirectory)..\InterfaceStubGenerator.BuildTasks\InterfaceStubGenerator.BuildTasks.csproj" -c $(Configuration) -f net461 + dotnet publish "$(MSBuildThisFileDirectory)..\InterfaceStubGenerator.BuildTasks\InterfaceStubGenerator.BuildTasks.csproj" -c $(Configuration) -f netcoreapp2.1 - dotnet publish "$(MSBuildThisFileDirectory)../InterfaceStubGenerator.BuildTasks/InterfaceStubGenerator.BuildTasks.csproj" -c $(Configuration) -f net46 - dotnet publish "$(MSBuildThisFileDirectory)../InterfaceStubGenerator.BuildTasks/InterfaceStubGenerator.BuildTasks.csproj" -c $(Configuration) -f netcoreapp2.0 + dotnet publish "$(MSBuildThisFileDirectory)../InterfaceStubGenerator.BuildTasks/InterfaceStubGenerator.BuildTasks.csproj" -c $(Configuration) -f net461 + dotnet publish "$(MSBuildThisFileDirectory)../InterfaceStubGenerator.BuildTasks/InterfaceStubGenerator.BuildTasks.csproj" -c $(Configuration) -f netcoreapp2.1 diff --git a/Refit/targets/refit.targets b/Refit/targets/refit.targets index e9bc2538e..0652ca11c 100644 --- a/Refit/targets/refit.targets +++ b/Refit/targets/refit.targets @@ -12,7 +12,7 @@ $(MSBuildThisFileDirectory)..\MSBuildCore20\InterfaceStubGenerator.BuildTasks.dll $(MSBuildThisFileDirectory)..\MSBuildFull46\InterfaceStubGenerator.BuildTasks.dll - 2.0 + 2.1 $(BundledNETCoreAppTargetFrameworkVersion) 1.0 @@ -28,7 +28,7 @@ From 9e91a9c4ecc707581c380a73a490665c8f4f70b0 Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Sat, 16 Feb 2019 16:15:15 -0500 Subject: [PATCH 02/11] Add support for the new buildTransitive, so direct references aren't needed to run the targets Fixes #598 --- Refit/Refit.csproj | 2 ++ 1 file changed, 2 insertions(+) diff --git a/Refit/Refit.csproj b/Refit/Refit.csproj index 6b0947445..6bcd5644d 100644 --- a/Refit/Refit.csproj +++ b/Refit/Refit.csproj @@ -27,7 +27,9 @@ + + From 6fa96c655520d9a13ff25aedb99441c522e189eb Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Sat, 16 Feb 2019 16:18:13 -0500 Subject: [PATCH 03/11] Update test refs --- Refit.Tests/Refit.Tests.csproj | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Refit.Tests/Refit.Tests.csproj b/Refit.Tests/Refit.Tests.csproj index 5898a9805..d4d696807 100644 --- a/Refit.Tests/Refit.Tests.csproj +++ b/Refit.Tests/Refit.Tests.csproj @@ -10,10 +10,10 @@ - - - - + + + + From 026fe00dc940ddbcc9490203ad3c6c3bb9f51f29 Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Sat, 16 Feb 2019 16:19:58 -0500 Subject: [PATCH 04/11] Fix warnings --- Refit/PushStreamContent.cs | 57 +++++++++---------- ...tBuilderImplementation.TaskToObservable.cs | 5 +- 2 files changed, 30 insertions(+), 32 deletions(-) diff --git a/Refit/PushStreamContent.cs b/Refit/PushStreamContent.cs index b60e18fce..3f4e76547 100644 --- a/Refit/PushStreamContent.cs +++ b/Refit/PushStreamContent.cs @@ -156,7 +156,7 @@ protected override bool TryComputeLength(out long length) internal class CompleteTaskOnCloseStream : DelegatingStream { - private TaskCompletionSource _serializeToStreamTask; + readonly TaskCompletionSource _serializeToStreamTask; public CompleteTaskOnCloseStream(Stream innerStream, TaskCompletionSource serializeToStreamTask) : base(innerStream) @@ -186,123 +186,118 @@ protected override void Dispose(bool disposing) [ExcludeFromCodeCoverage] abstract class DelegatingStream : Stream { - Stream innerStream; - protected DelegatingStream(Stream innerStream) { - this.innerStream = innerStream ?? throw new ArgumentNullException(nameof(innerStream)); + InnerStream = innerStream ?? throw new ArgumentNullException(nameof(innerStream)); } - protected Stream InnerStream - { - get { return innerStream; } - } + protected Stream InnerStream { get; private set; } public override bool CanRead { - get { return innerStream.CanRead; } + get { return InnerStream.CanRead; } } public override bool CanSeek { - get { return innerStream.CanSeek; } + get { return InnerStream.CanSeek; } } public override bool CanWrite { - get { return innerStream.CanWrite; } + get { return InnerStream.CanWrite; } } public override long Length { - get { return innerStream.Length; } + get { return InnerStream.Length; } } public override long Position { - get { return innerStream.Position; } - set { innerStream.Position = value; } + get { return InnerStream.Position; } + set { InnerStream.Position = value; } } public override int ReadTimeout { - get { return innerStream.ReadTimeout; } - set { innerStream.ReadTimeout = value; } + get { return InnerStream.ReadTimeout; } + set { InnerStream.ReadTimeout = value; } } public override bool CanTimeout { - get { return innerStream.CanTimeout; } + get { return InnerStream.CanTimeout; } } public override int WriteTimeout { - get { return innerStream.WriteTimeout; } - set { innerStream.WriteTimeout = value; } + get { return InnerStream.WriteTimeout; } + set { InnerStream.WriteTimeout = value; } } protected override void Dispose(bool disposing) { if (disposing) { - innerStream.Dispose(); + InnerStream.Dispose(); } base.Dispose(disposing); } public override long Seek(long offset, SeekOrigin origin) { - return innerStream.Seek(offset, origin); + return InnerStream.Seek(offset, origin); } public override int Read(byte[] buffer, int offset, int count) { - return innerStream.Read(buffer, offset, count); + return InnerStream.Read(buffer, offset, count); } public override Task ReadAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) { - return innerStream.ReadAsync(buffer, offset, count, cancellationToken); + return InnerStream.ReadAsync(buffer, offset, count, cancellationToken); } public override int ReadByte() { - return innerStream.ReadByte(); + return InnerStream.ReadByte(); } public override void Flush() { - innerStream.Flush(); + InnerStream.Flush(); } public override Task CopyToAsync(Stream destination, int bufferSize, CancellationToken cancellationToken) { - return innerStream.CopyToAsync(destination, bufferSize, cancellationToken); + return InnerStream.CopyToAsync(destination, bufferSize, cancellationToken); } public override Task FlushAsync(CancellationToken cancellationToken) { - return innerStream.FlushAsync(cancellationToken); + return InnerStream.FlushAsync(cancellationToken); } public override void SetLength(long value) { - innerStream.SetLength(value); + InnerStream.SetLength(value); } public override void Write(byte[] buffer, int offset, int count) { - innerStream.Write(buffer, offset, count); + InnerStream.Write(buffer, offset, count); } public override Task WriteAsync(byte[] buffer, int offset, int count, CancellationToken cancellationToken) { - return innerStream.WriteAsync(buffer, offset, count, cancellationToken); + return InnerStream.WriteAsync(buffer, offset, count, cancellationToken); } public override void WriteByte(byte value) { - innerStream.WriteByte(value); + InnerStream.WriteByte(value); } } } diff --git a/Refit/RequestBuilderImplementation.TaskToObservable.cs b/Refit/RequestBuilderImplementation.TaskToObservable.cs index 584ffee16..5109b16f4 100644 --- a/Refit/RequestBuilderImplementation.TaskToObservable.cs +++ b/Refit/RequestBuilderImplementation.TaskToObservable.cs @@ -20,14 +20,17 @@ public TaskToObservable(Func> taskFactory) public IDisposable Subscribe(IObserver observer) { var cts = new CancellationTokenSource(); +#pragma warning disable VSTHRD110 // Observe result of async calls taskFactory(cts.Token).ContinueWith(t => - { + { if (cts.IsCancellationRequested) return; ToObservableDone(t, observer); }, TaskScheduler.Default); +#pragma warning restore VSTHRD110 // Observe result of async calls + return new AnonymousDisposable(cts.Cancel); } From c45197bb75cba3585d852840ed0321dd9db2b1fd Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Sat, 16 Feb 2019 16:41:52 -0500 Subject: [PATCH 05/11] Code style --- InterfaceStubGenerator.App/Program.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/InterfaceStubGenerator.App/Program.cs b/InterfaceStubGenerator.App/Program.cs index 5ede364dd..465723de7 100644 --- a/InterfaceStubGenerator.App/Program.cs +++ b/InterfaceStubGenerator.App/Program.cs @@ -103,9 +103,9 @@ static int Main(string[] args) static class ConcatExtension { - public static IEnumerable Concat(this IEnumerable This, params IEnumerable[] others) + public static IEnumerable Concat(this IEnumerable @this, params IEnumerable[] others) { - foreach (var t in This) + foreach (var t in @this) { yield return t; } From be2c586a9b037f44128325002db8cf6153e29e2b Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Sat, 16 Feb 2019 16:42:14 -0500 Subject: [PATCH 06/11] Use full namespace to void potential dup imports --- .../GeneratedInterfaceStubTemplate.mustache | 44 +++++++++---------- 1 file changed, 21 insertions(+), 23 deletions(-) diff --git a/InterfaceStubGenerator.Core/GeneratedInterfaceStubTemplate.mustache b/InterfaceStubGenerator.Core/GeneratedInterfaceStubTemplate.mustache index 64be859cf..a4f942dc8 100644 --- a/InterfaceStubGenerator.Core/GeneratedInterfaceStubTemplate.mustache +++ b/InterfaceStubGenerator.Core/GeneratedInterfaceStubTemplate.mustache @@ -2,9 +2,6 @@ using System; using System.Net.Http; using System.Collections.Generic; -using System.Diagnostics; -using System.Diagnostics.CodeAnalysis; -using System.Reflection; {{#UsingList}} using {{Item}}; {{/UsingList}} @@ -18,7 +15,7 @@ using {{Item}}; #pragma warning disable namespace {{RefitInternalNamespace}}RefitInternalGenerated { - [ExcludeFromCodeCoverage] + [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] [AttributeUsage (AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Enum | AttributeTargets.Constructor | AttributeTargets.Method | AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Event | AttributeTargets.Interface | AttributeTargets.Delegate)] sealed class PreserveAttribute : Attribute { @@ -39,10 +36,10 @@ namespace {{Namespace}} using {{RefitInternalNamespace}}RefitInternalGenerated; /// - [ExcludeFromCodeCoverage] - [DebuggerNonUserCode] + [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] + [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] - [Obfuscation(Exclude=true)] + [global::System.Reflection.Obfuscation(Exclude=true)] partial class AutoGenerated{{GeneratedClassSuffix}}{{#TypeParameters}}<{{.}}> {{/TypeParameters}} : {{InterfaceName}}{{#TypeParameters}}<{{.}}> {{/TypeParameters}} @@ -57,29 +54,30 @@ namespace {{Namespace}} /// public AutoGenerated{{GeneratedClassSuffix}}(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } -{{#MethodList}} + {{#MethodList}} /// - public virtual {{ReturnType}} {{Name}}{{#MethodTypeParameters}}<{{.}}>{{/MethodTypeParameters}}({{ArgumentListWithTypes}}) - {{#MethodConstraintClauses}} + public virtual {{ReturnType}} {{Name}}{{#MethodTypeParameters}}<{{.}}> + {{/MethodTypeParameters}}({{ArgumentListWithTypes}}) + {{#MethodConstraintClauses}} {{.}} - {{/MethodConstraintClauses}} - { -{{#IsRefitMethod}} + {{/MethodConstraintClauses}} + { + {{#IsRefitMethod}} var arguments = new object[] { {{ArgumentList}} }; var func = requestBuilder.BuildRestResultFuncForMethod("{{Name}}", new Type[] { {{ArgumentTypesList}} }{{#MethodTypeParameterList}}, new Type[] { {{.}} }{{/MethodTypeParameterList}}); return ({{ReturnType}})func(Client, arguments); -{{/IsRefitMethod}} -{{^IsRefitMethod}} + {{/IsRefitMethod}} + {{^IsRefitMethod}} throw new NotImplementedException("Either this method has no Refit HTTP method attribute or you've used something other than a string literal for the 'path' argument."); -{{/IsRefitMethod}} - } + {{/IsRefitMethod}} + } -{{/MethodList}} - } -} + {{/MethodList}} + } + } -{{/ClassList}} + {{/ClassList}} From 913d617b3a6b704b269addd58c723c34062f08cf Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Sat, 16 Feb 2019 16:42:28 -0500 Subject: [PATCH 07/11] Point to the correct 461 dir --- Refit.Tests/Refit.Tests.csproj | 4 +- Refit.Tests/RefitStubs.Net46.cs | 618 +++++++++++++++-------------- Refit.Tests/RefitStubs.NetCore2.cs | 618 +++++++++++++++-------------- 3 files changed, 646 insertions(+), 594 deletions(-) diff --git a/Refit.Tests/Refit.Tests.csproj b/Refit.Tests/Refit.Tests.csproj index d4d696807..63949f40a 100644 --- a/Refit.Tests/Refit.Tests.csproj +++ b/Refit.Tests/Refit.Tests.csproj @@ -37,10 +37,10 @@ - "$(MSBuildThisFileDirectory)..\InterfaceStubGenerator.App\bin\$(ConfigurationName)\net46\InterfaceStubGenerator.App.exe" "$(OutputStubsFile)" "$(MSBuildProjectDirectory)" "$(RefitParameterFile)" "$(RootNamespace)" + "$(MSBuildThisFileDirectory)..\InterfaceStubGenerator.App\bin\$(ConfigurationName)\net461\InterfaceStubGenerator.App.exe" "$(OutputStubsFile)" "$(MSBuildProjectDirectory)" "$(RefitParameterFile)" "$(RootNamespace)" - mono "$(MSBuildThisFileDirectory)../InterfaceStubGenerator.App/bin/$(Configuration)/net46/InterfaceStubGenerator.App.exe" "$(OutputStubsFile)" "$(MSBuildProjectDirectory)" "$(RefitParameterFile)" "$(RootNamespace)" + mono "$(MSBuildThisFileDirectory)../InterfaceStubGenerator.App/bin/$(Configuration)/net461/InterfaceStubGenerator.App.exe" "$(OutputStubsFile)" "$(MSBuildProjectDirectory)" "$(RefitParameterFile)" "$(RootNamespace)" diff --git a/Refit.Tests/RefitStubs.Net46.cs b/Refit.Tests/RefitStubs.Net46.cs index 37823779c..8abebad36 100644 --- a/Refit.Tests/RefitStubs.Net46.cs +++ b/Refit.Tests/RefitStubs.Net46.cs @@ -2,8 +2,6 @@ using System; using System.Net.Http; using System.Collections.Generic; -using System.Diagnostics; -using System.Diagnostics.CodeAnalysis; using System.IO; using System.Text; using System.Threading.Tasks; @@ -37,7 +35,7 @@ #pragma warning disable namespace Refit.Tests.RefitInternalGenerated { - [ExcludeFromCodeCoverage] + [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] [AttributeUsage (AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Enum | AttributeTargets.Constructor | AttributeTargets.Method | AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Event | AttributeTargets.Interface | AttributeTargets.Delegate)] sealed class PreserveAttribute : Attribute { @@ -57,9 +55,10 @@ namespace Refit.Tests using Refit.Tests.RefitInternalGenerated; /// - [ExcludeFromCodeCoverage] - [DebuggerNonUserCode] + [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] + [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] + [global::System.Reflection.Obfuscation(Exclude=true)] partial class AutoGeneratedIAmARefitInterfaceButNobodyUsesMe : IAmARefitInterfaceButNobodyUsesMe { /// public HttpClient Client { get; protected set; } @@ -68,59 +67,60 @@ partial class AutoGeneratedIAmARefitInterfaceButNobodyUsesMe : IAmARefitInterfac /// public AutoGeneratedIAmARefitInterfaceButNobodyUsesMe(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task RefitMethod() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("RefitMethod", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task AnotherRefitMethod() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("AnotherRefitMethod", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task NoConstantsAllowed() - { + { throw new NotImplementedException("Either this method has no Refit HTTP method attribute or you've used something other than a string literal for the 'path' argument."); - } + } /// public virtual Task SpacesShouldntBreakMe() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("SpacesShouldntBreakMe", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task ReservedWordsForParameterNames(int @int,string @string,float @long) - { + { var arguments = new object[] { @int,@string,@long }; var func = requestBuilder.BuildRestResultFuncForMethod("ReservedWordsForParameterNames", new Type[] { typeof(int),typeof(string),typeof(float) }); return (Task)func(Client, arguments); - } + } - } -} + } + } namespace Refit.Tests { using Refit.Tests.RefitInternalGenerated; /// - [ExcludeFromCodeCoverage] - [DebuggerNonUserCode] + [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] + [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] + [global::System.Reflection.Obfuscation(Exclude=true)] partial class AutoGeneratedIAmHalfRefit : IAmHalfRefit { /// public HttpClient Client { get; protected set; } @@ -129,35 +129,36 @@ partial class AutoGeneratedIAmHalfRefit : IAmHalfRefit { /// public AutoGeneratedIAmHalfRefit(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task Post() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("Post", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task Get() - { + { throw new NotImplementedException("Either this method has no Refit HTTP method attribute or you've used something other than a string literal for the 'path' argument."); - } + } - } -} + } + } namespace Refit.Tests { using Refit.Tests.RefitInternalGenerated; /// - [ExcludeFromCodeCoverage] - [DebuggerNonUserCode] + [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] + [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] + [global::System.Reflection.Obfuscation(Exclude=true)] partial class AutoGeneratedIApiWithDecimal : IApiWithDecimal { /// public HttpClient Client { get; protected set; } @@ -166,29 +167,30 @@ partial class AutoGeneratedIApiWithDecimal : IApiWithDecimal { /// public AutoGeneratedIApiWithDecimal(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task GetWithDecimal(decimal value) - { + { var arguments = new object[] { value }; var func = requestBuilder.BuildRestResultFuncForMethod("GetWithDecimal", new Type[] { typeof(decimal) }); return (Task)func(Client, arguments); - } + } - } -} + } + } namespace Refit.Tests { using Refit.Tests.RefitInternalGenerated; /// - [ExcludeFromCodeCoverage] - [DebuggerNonUserCode] + [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] + [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] + [global::System.Reflection.Obfuscation(Exclude=true)] partial class AutoGeneratedIBodylessApi : IBodylessApi { /// public HttpClient Client { get; protected set; } @@ -197,45 +199,46 @@ partial class AutoGeneratedIBodylessApi : IBodylessApi { /// public AutoGeneratedIBodylessApi(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task Post() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("Post", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task Get() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task Head() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("Head", new Type[] { }); return (Task)func(Client, arguments); - } + } - } -} + } + } namespace Refit.Tests { using Refit.Tests.RefitInternalGenerated; /// - [ExcludeFromCodeCoverage] - [DebuggerNonUserCode] + [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] + [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] + [global::System.Reflection.Obfuscation(Exclude=true)] partial class AutoGeneratedIBoringCrudApi : IBoringCrudApi where T : class @@ -247,61 +250,62 @@ partial class AutoGeneratedIBoringCrudApi /// public AutoGeneratedIBoringCrudApi(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task Create(T paylod) - { + { var arguments = new object[] { paylod }; var func = requestBuilder.BuildRestResultFuncForMethod("Create", new Type[] { typeof(T) }); return (Task)func(Client, arguments); - } + } /// public virtual Task> ReadAll() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("ReadAll", new Type[] { }); return (Task>)func(Client, arguments); - } + } /// public virtual Task ReadOne(TKey key) - { + { var arguments = new object[] { key }; var func = requestBuilder.BuildRestResultFuncForMethod("ReadOne", new Type[] { typeof(TKey) }); return (Task)func(Client, arguments); - } + } /// public virtual Task Update(TKey key,T payload) - { + { var arguments = new object[] { key,payload }; var func = requestBuilder.BuildRestResultFuncForMethod("Update", new Type[] { typeof(TKey),typeof(T) }); return (Task)func(Client, arguments); - } + } /// public virtual Task Delete(TKey key) - { + { var arguments = new object[] { key }; var func = requestBuilder.BuildRestResultFuncForMethod("Delete", new Type[] { typeof(TKey) }); return (Task)func(Client, arguments); - } + } - } -} + } + } namespace Refit.Tests { using Refit.Tests.RefitInternalGenerated; /// - [ExcludeFromCodeCoverage] - [DebuggerNonUserCode] + [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] + [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] + [global::System.Reflection.Obfuscation(Exclude=true)] partial class AutoGeneratedIBrokenWebApi : IBrokenWebApi { /// public HttpClient Client { get; protected set; } @@ -310,29 +314,30 @@ partial class AutoGeneratedIBrokenWebApi : IBrokenWebApi { /// public AutoGeneratedIBrokenWebApi(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task PostAValue(string derp) - { + { var arguments = new object[] { derp }; var func = requestBuilder.BuildRestResultFuncForMethod("PostAValue", new Type[] { typeof(string) }); return (Task)func(Client, arguments); - } + } - } -} + } + } namespace Refit.Tests { using Refit.Tests.RefitInternalGenerated; /// - [ExcludeFromCodeCoverage] - [DebuggerNonUserCode] + [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] + [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] + [global::System.Reflection.Obfuscation(Exclude=true)] partial class AutoGeneratedIGitHubApi : IGitHubApi { /// public HttpClient Client { get; protected set; } @@ -341,125 +346,126 @@ partial class AutoGeneratedIGitHubApi : IGitHubApi { /// public AutoGeneratedIGitHubApi(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task GetUser(string userName) - { + { var arguments = new object[] { userName }; var func = requestBuilder.BuildRestResultFuncForMethod("GetUser", new Type[] { typeof(string) }); return (Task)func(Client, arguments); - } + } /// public virtual IObservable GetUserObservable(string userName) - { + { var arguments = new object[] { userName }; var func = requestBuilder.BuildRestResultFuncForMethod("GetUserObservable", new Type[] { typeof(string) }); return (IObservable)func(Client, arguments); - } + } /// public virtual IObservable GetUserCamelCase(string userName) - { + { var arguments = new object[] { userName }; var func = requestBuilder.BuildRestResultFuncForMethod("GetUserCamelCase", new Type[] { typeof(string) }); return (IObservable)func(Client, arguments); - } + } /// public virtual Task> GetOrgMembers(string orgName) - { + { var arguments = new object[] { orgName }; var func = requestBuilder.BuildRestResultFuncForMethod("GetOrgMembers", new Type[] { typeof(string) }); return (Task>)func(Client, arguments); - } + } /// public virtual Task FindUsers(string q) - { + { var arguments = new object[] { q }; var func = requestBuilder.BuildRestResultFuncForMethod("FindUsers", new Type[] { typeof(string) }); return (Task)func(Client, arguments); - } + } /// public virtual Task GetIndex() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("GetIndex", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual IObservable GetIndexObservable() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("GetIndexObservable", new Type[] { }); return (IObservable)func(Client, arguments); - } + } /// public virtual Task NothingToSeeHere() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("NothingToSeeHere", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task> NothingToSeeHereWithMetadata() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("NothingToSeeHereWithMetadata", new Type[] { }); return (Task>)func(Client, arguments); - } + } /// public virtual Task> GetUserWithMetadata(string userName) - { + { var arguments = new object[] { userName }; var func = requestBuilder.BuildRestResultFuncForMethod("GetUserWithMetadata", new Type[] { typeof(string) }); return (Task>)func(Client, arguments); - } + } /// public virtual IObservable> GetUserObservableWithMetadata(string userName) - { + { var arguments = new object[] { userName }; var func = requestBuilder.BuildRestResultFuncForMethod("GetUserObservableWithMetadata", new Type[] { typeof(string) }); return (IObservable>)func(Client, arguments); - } + } /// public virtual Task CreateUser(User user) - { + { var arguments = new object[] { user }; var func = requestBuilder.BuildRestResultFuncForMethod("CreateUser", new Type[] { typeof(User) }); return (Task)func(Client, arguments); - } + } /// public virtual Task> CreateUserWithMetadata(User user) - { + { var arguments = new object[] { user }; var func = requestBuilder.BuildRestResultFuncForMethod("CreateUserWithMetadata", new Type[] { typeof(User) }); return (Task>)func(Client, arguments); - } + } - } -} + } + } namespace Refit.Tests { using Refit.Tests.RefitInternalGenerated; /// - [ExcludeFromCodeCoverage] - [DebuggerNonUserCode] + [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] + [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] + [global::System.Reflection.Obfuscation(Exclude=true)] partial class AutoGeneratedIHttpBinApi : IHttpBinApi where TResponse : class @@ -472,53 +478,55 @@ partial class AutoGeneratedIHttpBinApi /// public AutoGeneratedIHttpBinApi(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task Get(TParam param,THeader header) - { + { var arguments = new object[] { param,header }; var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] { typeof(TParam),typeof(THeader) }); return (Task)func(Client, arguments); - } + } /// public virtual Task GetQuery(TParam param) - { + { var arguments = new object[] { param }; var func = requestBuilder.BuildRestResultFuncForMethod("GetQuery", new Type[] { typeof(TParam) }); return (Task)func(Client, arguments); - } + } /// public virtual Task GetQueryWithIncludeParameterName(TParam param) - { + { var arguments = new object[] { param }; var func = requestBuilder.BuildRestResultFuncForMethod("GetQueryWithIncludeParameterName", new Type[] { typeof(TParam) }); return (Task)func(Client, arguments); - } + } /// - public virtual Task GetQuery1(TParam param) - { + public virtual Task GetQuery1 + (TParam param) + { var arguments = new object[] { param }; var func = requestBuilder.BuildRestResultFuncForMethod("GetQuery1", new Type[] { typeof(TParam) }, new Type[] { typeof(TValue) }); return (Task)func(Client, arguments); - } + } - } -} + } + } namespace Refit.Tests { using Refit.Tests.RefitInternalGenerated; /// - [ExcludeFromCodeCoverage] - [DebuggerNonUserCode] + [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] + [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] + [global::System.Reflection.Obfuscation(Exclude=true)] partial class AutoGeneratedIHttpContentApi : IHttpContentApi { /// public HttpClient Client { get; protected set; } @@ -527,37 +535,38 @@ partial class AutoGeneratedIHttpContentApi : IHttpContentApi { /// public AutoGeneratedIHttpContentApi(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task PostFileUpload(HttpContent content) - { + { var arguments = new object[] { content }; var func = requestBuilder.BuildRestResultFuncForMethod("PostFileUpload", new Type[] { typeof(HttpContent) }); return (Task)func(Client, arguments); - } + } /// public virtual Task> PostFileUploadWithMetadata(HttpContent content) - { + { var arguments = new object[] { content }; var func = requestBuilder.BuildRestResultFuncForMethod("PostFileUploadWithMetadata", new Type[] { typeof(HttpContent) }); return (Task>)func(Client, arguments); - } + } - } -} + } + } namespace Refit.Tests { using Refit.Tests.RefitInternalGenerated; /// - [ExcludeFromCodeCoverage] - [DebuggerNonUserCode] + [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] + [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] + [global::System.Reflection.Obfuscation(Exclude=true)] partial class AutoGeneratedResponseTestsIMyAliasService : ResponseTests.IMyAliasService { /// public HttpClient Client { get; protected set; } @@ -566,29 +575,30 @@ partial class AutoGeneratedResponseTestsIMyAliasService : ResponseTests.IMyAlias /// public AutoGeneratedResponseTestsIMyAliasService(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task GetTestObject() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("GetTestObject", new Type[] { }); return (Task)func(Client, arguments); - } + } - } -} + } + } namespace Refit.Tests { using Refit.Tests.RefitInternalGenerated; /// - [ExcludeFromCodeCoverage] - [DebuggerNonUserCode] + [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] + [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] + [global::System.Reflection.Obfuscation(Exclude=true)] partial class AutoGeneratedAuthenticatedClientHandlerTestsIMyAuthenticatedService : AuthenticatedClientHandlerTests.IMyAuthenticatedService { /// public HttpClient Client { get; protected set; } @@ -597,37 +607,38 @@ partial class AutoGeneratedAuthenticatedClientHandlerTestsIMyAuthenticatedServic /// public AutoGeneratedAuthenticatedClientHandlerTestsIMyAuthenticatedService(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task GetUnauthenticated() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("GetUnauthenticated", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task GetAuthenticated() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("GetAuthenticated", new Type[] { }); return (Task)func(Client, arguments); - } + } - } -} + } + } namespace Refit.Tests { using Refit.Tests.RefitInternalGenerated; /// - [ExcludeFromCodeCoverage] - [DebuggerNonUserCode] + [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] + [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] + [global::System.Reflection.Obfuscation(Exclude=true)] partial class AutoGeneratedINamespaceCollisionApi : INamespaceCollisionApi { /// public HttpClient Client { get; protected set; } @@ -636,29 +647,30 @@ partial class AutoGeneratedINamespaceCollisionApi : INamespaceCollisionApi /// public AutoGeneratedINamespaceCollisionApi(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task SomeRequest() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("SomeRequest", new Type[] { }); return (Task)func(Client, arguments); - } + } - } -} + } + } namespace Refit.Tests { using Refit.Tests.RefitInternalGenerated; /// - [ExcludeFromCodeCoverage] - [DebuggerNonUserCode] + [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] + [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] + [global::System.Reflection.Obfuscation(Exclude=true)] partial class AutoGeneratedTestNestedINestedGitHubApi : TestNested.INestedGitHubApi { /// public HttpClient Client { get; protected set; } @@ -667,85 +679,86 @@ partial class AutoGeneratedTestNestedINestedGitHubApi : TestNested.INestedGitHub /// public AutoGeneratedTestNestedINestedGitHubApi(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task GetUser(string userName) - { + { var arguments = new object[] { userName }; var func = requestBuilder.BuildRestResultFuncForMethod("GetUser", new Type[] { typeof(string) }); return (Task)func(Client, arguments); - } + } /// public virtual IObservable GetUserObservable(string userName) - { + { var arguments = new object[] { userName }; var func = requestBuilder.BuildRestResultFuncForMethod("GetUserObservable", new Type[] { typeof(string) }); return (IObservable)func(Client, arguments); - } + } /// public virtual IObservable GetUserCamelCase(string userName) - { + { var arguments = new object[] { userName }; var func = requestBuilder.BuildRestResultFuncForMethod("GetUserCamelCase", new Type[] { typeof(string) }); return (IObservable)func(Client, arguments); - } + } /// public virtual Task> GetOrgMembers(string orgName) - { + { var arguments = new object[] { orgName }; var func = requestBuilder.BuildRestResultFuncForMethod("GetOrgMembers", new Type[] { typeof(string) }); return (Task>)func(Client, arguments); - } + } /// public virtual Task FindUsers(string q) - { + { var arguments = new object[] { q }; var func = requestBuilder.BuildRestResultFuncForMethod("FindUsers", new Type[] { typeof(string) }); return (Task)func(Client, arguments); - } + } /// public virtual Task GetIndex() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("GetIndex", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual IObservable GetIndexObservable() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("GetIndexObservable", new Type[] { }); return (IObservable)func(Client, arguments); - } + } /// public virtual Task NothingToSeeHere() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("NothingToSeeHere", new Type[] { }); return (Task)func(Client, arguments); - } + } - } -} + } + } namespace Refit.Tests { using Refit.Tests.RefitInternalGenerated; /// - [ExcludeFromCodeCoverage] - [DebuggerNonUserCode] + [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] + [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] + [global::System.Reflection.Obfuscation(Exclude=true)] partial class AutoGeneratedINonGenericInterfaceWithGenericMethod : INonGenericInterfaceWithGenericMethod { /// public HttpClient Client { get; protected set; } @@ -754,39 +767,42 @@ partial class AutoGeneratedINonGenericInterfaceWithGenericMethod : INonGenericIn /// public AutoGeneratedINonGenericInterfaceWithGenericMethod(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// - public virtual Task PostMessage(T message) + public virtual Task PostMessage + (T message) where T : IMessage - { + { var arguments = new object[] { message }; var func = requestBuilder.BuildRestResultFuncForMethod("PostMessage", new Type[] { typeof(T) }, new Type[] { typeof(T) }); return (Task)func(Client, arguments); - } + } /// - public virtual Task PostMessage(T message,U param1,V param2) + public virtual Task PostMessage + (T message,U param1,V param2) where T : IMessage where U : T - { + { var arguments = new object[] { message,param1,param2 }; var func = requestBuilder.BuildRestResultFuncForMethod("PostMessage", new Type[] { typeof(T),typeof(U),typeof(V) }, new Type[] { typeof(T), typeof(U), typeof(V) }); return (Task)func(Client, arguments); - } + } - } -} + } + } namespace Refit.Tests { using Refit.Tests.RefitInternalGenerated; /// - [ExcludeFromCodeCoverage] - [DebuggerNonUserCode] + [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] + [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] + [global::System.Reflection.Obfuscation(Exclude=true)] partial class AutoGeneratedINpmJs : INpmJs { /// public HttpClient Client { get; protected set; } @@ -795,29 +811,30 @@ partial class AutoGeneratedINpmJs : INpmJs { /// public AutoGeneratedINpmJs(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task GetCongruence() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("GetCongruence", new Type[] { }); return (Task)func(Client, arguments); - } + } - } -} + } + } namespace Refit.Tests { using Refit.Tests.RefitInternalGenerated; /// - [ExcludeFromCodeCoverage] - [DebuggerNonUserCode] + [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] + [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] + [global::System.Reflection.Obfuscation(Exclude=true)] partial class AutoGeneratedIRequestBin : IRequestBin { /// public HttpClient Client { get; protected set; } @@ -826,61 +843,63 @@ partial class AutoGeneratedIRequestBin : IRequestBin { /// public AutoGeneratedIRequestBin(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task Post() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("Post", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task PostRawStringDefault(string str) - { + { var arguments = new object[] { str }; var func = requestBuilder.BuildRestResultFuncForMethod("PostRawStringDefault", new Type[] { typeof(string) }); return (Task)func(Client, arguments); - } + } /// public virtual Task PostRawStringJson(string str) - { + { var arguments = new object[] { str }; var func = requestBuilder.BuildRestResultFuncForMethod("PostRawStringJson", new Type[] { typeof(string) }); return (Task)func(Client, arguments); - } + } /// public virtual Task PostRawStringUrlEncoded(string str) - { + { var arguments = new object[] { str }; var func = requestBuilder.BuildRestResultFuncForMethod("PostRawStringUrlEncoded", new Type[] { typeof(string) }); return (Task)func(Client, arguments); - } + } /// - public virtual Task PostGeneric(T param) - { + public virtual Task PostGeneric + (T param) + { var arguments = new object[] { param }; var func = requestBuilder.BuildRestResultFuncForMethod("PostGeneric", new Type[] { typeof(T) }, new Type[] { typeof(T) }); return (Task)func(Client, arguments); - } + } - } -} + } + } namespace Refit.Tests { using Refit.Tests.RefitInternalGenerated; /// - [ExcludeFromCodeCoverage] - [DebuggerNonUserCode] + [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] + [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] + [global::System.Reflection.Obfuscation(Exclude=true)] partial class AutoGeneratedIRunscopeApi : IRunscopeApi { /// public HttpClient Client { get; protected set; } @@ -889,109 +908,110 @@ partial class AutoGeneratedIRunscopeApi : IRunscopeApi { /// public AutoGeneratedIRunscopeApi(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task UploadStream(Stream stream) - { + { var arguments = new object[] { stream }; var func = requestBuilder.BuildRestResultFuncForMethod("UploadStream", new Type[] { typeof(Stream) }); return (Task)func(Client, arguments); - } + } /// public virtual Task UploadStreamPart(StreamPart stream) - { + { var arguments = new object[] { stream }; var func = requestBuilder.BuildRestResultFuncForMethod("UploadStreamPart", new Type[] { typeof(StreamPart) }); return (Task)func(Client, arguments); - } + } /// public virtual Task UploadBytes(byte[] bytes) - { + { var arguments = new object[] { bytes }; var func = requestBuilder.BuildRestResultFuncForMethod("UploadBytes", new Type[] { typeof(byte[]) }); return (Task)func(Client, arguments); - } + } /// public virtual Task UploadBytesPart(ByteArrayPart bytes) - { + { var arguments = new object[] { bytes }; var func = requestBuilder.BuildRestResultFuncForMethod("UploadBytesPart", new Type[] { typeof(ByteArrayPart) }); return (Task)func(Client, arguments); - } + } /// public virtual Task UploadString(string someString) - { + { var arguments = new object[] { someString }; var func = requestBuilder.BuildRestResultFuncForMethod("UploadString", new Type[] { typeof(string) }); return (Task)func(Client, arguments); - } + } /// public virtual Task UploadFileInfo(IEnumerable fileInfos,FileInfo anotherFile) - { + { var arguments = new object[] { fileInfos,anotherFile }; var func = requestBuilder.BuildRestResultFuncForMethod("UploadFileInfo", new Type[] { typeof(IEnumerable),typeof(FileInfo) }); return (Task)func(Client, arguments); - } + } /// public virtual Task UploadFileInfoPart(IEnumerable fileInfos,FileInfoPart anotherFile) - { + { var arguments = new object[] { fileInfos,anotherFile }; var func = requestBuilder.BuildRestResultFuncForMethod("UploadFileInfoPart", new Type[] { typeof(IEnumerable),typeof(FileInfoPart) }); return (Task)func(Client, arguments); - } + } /// public virtual Task UploadJsonObject(ModelObject theObject) - { + { var arguments = new object[] { theObject }; var func = requestBuilder.BuildRestResultFuncForMethod("UploadJsonObject", new Type[] { typeof(ModelObject) }); return (Task)func(Client, arguments); - } + } /// public virtual Task UploadJsonObjects(IEnumerable theObjects) - { + { var arguments = new object[] { theObjects }; var func = requestBuilder.BuildRestResultFuncForMethod("UploadJsonObjects", new Type[] { typeof(IEnumerable) }); return (Task)func(Client, arguments); - } + } /// public virtual Task UploadMixedObjects(IEnumerable theObjects,AnotherModel anotherModel,FileInfo aFile,AnEnum anEnum,string aString,int anInt) - { + { var arguments = new object[] { theObjects,anotherModel,aFile,anEnum,aString,anInt }; var func = requestBuilder.BuildRestResultFuncForMethod("UploadMixedObjects", new Type[] { typeof(IEnumerable),typeof(AnotherModel),typeof(FileInfo),typeof(AnEnum),typeof(string),typeof(int) }); return (Task)func(Client, arguments); - } + } /// public virtual Task UploadHttpContent(HttpContent content) - { + { var arguments = new object[] { content }; var func = requestBuilder.BuildRestResultFuncForMethod("UploadHttpContent", new Type[] { typeof(HttpContent) }); return (Task)func(Client, arguments); - } + } - } -} + } + } namespace AutoGeneratedIServiceWithoutNamespace { using Refit.Tests.RefitInternalGenerated; /// - [ExcludeFromCodeCoverage] - [DebuggerNonUserCode] + [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] + [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] + [global::System.Reflection.Obfuscation(Exclude=true)] partial class AutoGeneratedIServiceWithoutNamespace : IServiceWithoutNamespace { /// public HttpClient Client { get; protected set; } @@ -1000,37 +1020,38 @@ partial class AutoGeneratedIServiceWithoutNamespace : IServiceWithoutNamespace /// public AutoGeneratedIServiceWithoutNamespace(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task GetRoot() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("GetRoot", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task PostRoot() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("PostRoot", new Type[] { }); return (Task)func(Client, arguments); - } + } - } -} + } + } namespace Refit.Tests { using Refit.Tests.RefitInternalGenerated; /// - [ExcludeFromCodeCoverage] - [DebuggerNonUserCode] + [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] + [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] + [global::System.Reflection.Obfuscation(Exclude=true)] partial class AutoGeneratedIStreamApi : IStreamApi { /// public HttpClient Client { get; protected set; } @@ -1039,37 +1060,38 @@ partial class AutoGeneratedIStreamApi : IStreamApi { /// public AutoGeneratedIStreamApi(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task GetRemoteFile(string filename) - { + { var arguments = new object[] { filename }; var func = requestBuilder.BuildRestResultFuncForMethod("GetRemoteFile", new Type[] { typeof(string) }); return (Task)func(Client, arguments); - } + } /// public virtual Task> GetRemoteFileWithMetadata(string filename) - { + { var arguments = new object[] { filename }; var func = requestBuilder.BuildRestResultFuncForMethod("GetRemoteFileWithMetadata", new Type[] { typeof(string) }); return (Task>)func(Client, arguments); - } + } - } -} + } + } namespace Refit.Tests { using Refit.Tests.RefitInternalGenerated; /// - [ExcludeFromCodeCoverage] - [DebuggerNonUserCode] + [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] + [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] + [global::System.Reflection.Obfuscation(Exclude=true)] partial class AutoGeneratedIUseOverloadedGenericMethods : IUseOverloadedGenericMethods where TResponse : class @@ -1082,77 +1104,81 @@ partial class AutoGeneratedIUseOverloadedGenericMethods public AutoGeneratedIUseOverloadedGenericMethods(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task Get() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task Get(TParam param,THeader header) - { + { var arguments = new object[] { param,header }; var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] { typeof(TParam),typeof(THeader) }); return (Task)func(Client, arguments); - } + } /// public virtual Task Get(THeader param,TParam header) - { + { var arguments = new object[] { param,header }; var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] { typeof(THeader),typeof(TParam) }); return (Task)func(Client, arguments); - } + } /// public virtual Task Get(int httpstatuscode) - { + { var arguments = new object[] { httpstatuscode }; var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] { typeof(int) }); return (Task)func(Client, arguments); - } + } /// - public virtual Task Get(int someVal) - { + public virtual Task Get + (int someVal) + { var arguments = new object[] { someVal }; var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] { typeof(int) }, new Type[] { typeof(TValue) }); return (Task)func(Client, arguments); - } + } /// - public virtual Task Get(TInput input) - { + public virtual Task Get + (TInput input) + { var arguments = new object[] { input }; var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] { typeof(TInput) }, new Type[] { typeof(TValue), typeof(TInput) }); return (Task)func(Client, arguments); - } + } /// - public virtual Task Get(TInput1 input1,TInput2 input2) - { + public virtual Task Get + (TInput1 input1,TInput2 input2) + { var arguments = new object[] { input1,input2 }; var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] { typeof(TInput1),typeof(TInput2) }, new Type[] { typeof(TInput1), typeof(TInput2) }); return (Task)func(Client, arguments); - } + } - } -} + } + } namespace Refit.Tests { using Refit.Tests.RefitInternalGenerated; /// - [ExcludeFromCodeCoverage] - [DebuggerNonUserCode] + [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] + [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] + [global::System.Reflection.Obfuscation(Exclude=true)] partial class AutoGeneratedIUseOverloadedMethods : IUseOverloadedMethods { /// public HttpClient Client { get; protected set; } @@ -1161,25 +1187,25 @@ partial class AutoGeneratedIUseOverloadedMethods : IUseOverloadedMethods /// public AutoGeneratedIUseOverloadedMethods(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task Get() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task Get(int httpstatuscode) - { + { var arguments = new object[] { httpstatuscode }; var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] { typeof(int) }); return (Task)func(Client, arguments); - } + } - } -} + } + } diff --git a/Refit.Tests/RefitStubs.NetCore2.cs b/Refit.Tests/RefitStubs.NetCore2.cs index 37823779c..8abebad36 100644 --- a/Refit.Tests/RefitStubs.NetCore2.cs +++ b/Refit.Tests/RefitStubs.NetCore2.cs @@ -2,8 +2,6 @@ using System; using System.Net.Http; using System.Collections.Generic; -using System.Diagnostics; -using System.Diagnostics.CodeAnalysis; using System.IO; using System.Text; using System.Threading.Tasks; @@ -37,7 +35,7 @@ #pragma warning disable namespace Refit.Tests.RefitInternalGenerated { - [ExcludeFromCodeCoverage] + [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] [AttributeUsage (AttributeTargets.Class | AttributeTargets.Struct | AttributeTargets.Enum | AttributeTargets.Constructor | AttributeTargets.Method | AttributeTargets.Property | AttributeTargets.Field | AttributeTargets.Event | AttributeTargets.Interface | AttributeTargets.Delegate)] sealed class PreserveAttribute : Attribute { @@ -57,9 +55,10 @@ namespace Refit.Tests using Refit.Tests.RefitInternalGenerated; /// - [ExcludeFromCodeCoverage] - [DebuggerNonUserCode] + [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] + [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] + [global::System.Reflection.Obfuscation(Exclude=true)] partial class AutoGeneratedIAmARefitInterfaceButNobodyUsesMe : IAmARefitInterfaceButNobodyUsesMe { /// public HttpClient Client { get; protected set; } @@ -68,59 +67,60 @@ partial class AutoGeneratedIAmARefitInterfaceButNobodyUsesMe : IAmARefitInterfac /// public AutoGeneratedIAmARefitInterfaceButNobodyUsesMe(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task RefitMethod() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("RefitMethod", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task AnotherRefitMethod() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("AnotherRefitMethod", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task NoConstantsAllowed() - { + { throw new NotImplementedException("Either this method has no Refit HTTP method attribute or you've used something other than a string literal for the 'path' argument."); - } + } /// public virtual Task SpacesShouldntBreakMe() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("SpacesShouldntBreakMe", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task ReservedWordsForParameterNames(int @int,string @string,float @long) - { + { var arguments = new object[] { @int,@string,@long }; var func = requestBuilder.BuildRestResultFuncForMethod("ReservedWordsForParameterNames", new Type[] { typeof(int),typeof(string),typeof(float) }); return (Task)func(Client, arguments); - } + } - } -} + } + } namespace Refit.Tests { using Refit.Tests.RefitInternalGenerated; /// - [ExcludeFromCodeCoverage] - [DebuggerNonUserCode] + [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] + [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] + [global::System.Reflection.Obfuscation(Exclude=true)] partial class AutoGeneratedIAmHalfRefit : IAmHalfRefit { /// public HttpClient Client { get; protected set; } @@ -129,35 +129,36 @@ partial class AutoGeneratedIAmHalfRefit : IAmHalfRefit { /// public AutoGeneratedIAmHalfRefit(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task Post() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("Post", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task Get() - { + { throw new NotImplementedException("Either this method has no Refit HTTP method attribute or you've used something other than a string literal for the 'path' argument."); - } + } - } -} + } + } namespace Refit.Tests { using Refit.Tests.RefitInternalGenerated; /// - [ExcludeFromCodeCoverage] - [DebuggerNonUserCode] + [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] + [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] + [global::System.Reflection.Obfuscation(Exclude=true)] partial class AutoGeneratedIApiWithDecimal : IApiWithDecimal { /// public HttpClient Client { get; protected set; } @@ -166,29 +167,30 @@ partial class AutoGeneratedIApiWithDecimal : IApiWithDecimal { /// public AutoGeneratedIApiWithDecimal(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task GetWithDecimal(decimal value) - { + { var arguments = new object[] { value }; var func = requestBuilder.BuildRestResultFuncForMethod("GetWithDecimal", new Type[] { typeof(decimal) }); return (Task)func(Client, arguments); - } + } - } -} + } + } namespace Refit.Tests { using Refit.Tests.RefitInternalGenerated; /// - [ExcludeFromCodeCoverage] - [DebuggerNonUserCode] + [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] + [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] + [global::System.Reflection.Obfuscation(Exclude=true)] partial class AutoGeneratedIBodylessApi : IBodylessApi { /// public HttpClient Client { get; protected set; } @@ -197,45 +199,46 @@ partial class AutoGeneratedIBodylessApi : IBodylessApi { /// public AutoGeneratedIBodylessApi(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task Post() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("Post", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task Get() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task Head() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("Head", new Type[] { }); return (Task)func(Client, arguments); - } + } - } -} + } + } namespace Refit.Tests { using Refit.Tests.RefitInternalGenerated; /// - [ExcludeFromCodeCoverage] - [DebuggerNonUserCode] + [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] + [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] + [global::System.Reflection.Obfuscation(Exclude=true)] partial class AutoGeneratedIBoringCrudApi : IBoringCrudApi where T : class @@ -247,61 +250,62 @@ partial class AutoGeneratedIBoringCrudApi /// public AutoGeneratedIBoringCrudApi(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task Create(T paylod) - { + { var arguments = new object[] { paylod }; var func = requestBuilder.BuildRestResultFuncForMethod("Create", new Type[] { typeof(T) }); return (Task)func(Client, arguments); - } + } /// public virtual Task> ReadAll() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("ReadAll", new Type[] { }); return (Task>)func(Client, arguments); - } + } /// public virtual Task ReadOne(TKey key) - { + { var arguments = new object[] { key }; var func = requestBuilder.BuildRestResultFuncForMethod("ReadOne", new Type[] { typeof(TKey) }); return (Task)func(Client, arguments); - } + } /// public virtual Task Update(TKey key,T payload) - { + { var arguments = new object[] { key,payload }; var func = requestBuilder.BuildRestResultFuncForMethod("Update", new Type[] { typeof(TKey),typeof(T) }); return (Task)func(Client, arguments); - } + } /// public virtual Task Delete(TKey key) - { + { var arguments = new object[] { key }; var func = requestBuilder.BuildRestResultFuncForMethod("Delete", new Type[] { typeof(TKey) }); return (Task)func(Client, arguments); - } + } - } -} + } + } namespace Refit.Tests { using Refit.Tests.RefitInternalGenerated; /// - [ExcludeFromCodeCoverage] - [DebuggerNonUserCode] + [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] + [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] + [global::System.Reflection.Obfuscation(Exclude=true)] partial class AutoGeneratedIBrokenWebApi : IBrokenWebApi { /// public HttpClient Client { get; protected set; } @@ -310,29 +314,30 @@ partial class AutoGeneratedIBrokenWebApi : IBrokenWebApi { /// public AutoGeneratedIBrokenWebApi(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task PostAValue(string derp) - { + { var arguments = new object[] { derp }; var func = requestBuilder.BuildRestResultFuncForMethod("PostAValue", new Type[] { typeof(string) }); return (Task)func(Client, arguments); - } + } - } -} + } + } namespace Refit.Tests { using Refit.Tests.RefitInternalGenerated; /// - [ExcludeFromCodeCoverage] - [DebuggerNonUserCode] + [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] + [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] + [global::System.Reflection.Obfuscation(Exclude=true)] partial class AutoGeneratedIGitHubApi : IGitHubApi { /// public HttpClient Client { get; protected set; } @@ -341,125 +346,126 @@ partial class AutoGeneratedIGitHubApi : IGitHubApi { /// public AutoGeneratedIGitHubApi(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task GetUser(string userName) - { + { var arguments = new object[] { userName }; var func = requestBuilder.BuildRestResultFuncForMethod("GetUser", new Type[] { typeof(string) }); return (Task)func(Client, arguments); - } + } /// public virtual IObservable GetUserObservable(string userName) - { + { var arguments = new object[] { userName }; var func = requestBuilder.BuildRestResultFuncForMethod("GetUserObservable", new Type[] { typeof(string) }); return (IObservable)func(Client, arguments); - } + } /// public virtual IObservable GetUserCamelCase(string userName) - { + { var arguments = new object[] { userName }; var func = requestBuilder.BuildRestResultFuncForMethod("GetUserCamelCase", new Type[] { typeof(string) }); return (IObservable)func(Client, arguments); - } + } /// public virtual Task> GetOrgMembers(string orgName) - { + { var arguments = new object[] { orgName }; var func = requestBuilder.BuildRestResultFuncForMethod("GetOrgMembers", new Type[] { typeof(string) }); return (Task>)func(Client, arguments); - } + } /// public virtual Task FindUsers(string q) - { + { var arguments = new object[] { q }; var func = requestBuilder.BuildRestResultFuncForMethod("FindUsers", new Type[] { typeof(string) }); return (Task)func(Client, arguments); - } + } /// public virtual Task GetIndex() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("GetIndex", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual IObservable GetIndexObservable() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("GetIndexObservable", new Type[] { }); return (IObservable)func(Client, arguments); - } + } /// public virtual Task NothingToSeeHere() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("NothingToSeeHere", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task> NothingToSeeHereWithMetadata() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("NothingToSeeHereWithMetadata", new Type[] { }); return (Task>)func(Client, arguments); - } + } /// public virtual Task> GetUserWithMetadata(string userName) - { + { var arguments = new object[] { userName }; var func = requestBuilder.BuildRestResultFuncForMethod("GetUserWithMetadata", new Type[] { typeof(string) }); return (Task>)func(Client, arguments); - } + } /// public virtual IObservable> GetUserObservableWithMetadata(string userName) - { + { var arguments = new object[] { userName }; var func = requestBuilder.BuildRestResultFuncForMethod("GetUserObservableWithMetadata", new Type[] { typeof(string) }); return (IObservable>)func(Client, arguments); - } + } /// public virtual Task CreateUser(User user) - { + { var arguments = new object[] { user }; var func = requestBuilder.BuildRestResultFuncForMethod("CreateUser", new Type[] { typeof(User) }); return (Task)func(Client, arguments); - } + } /// public virtual Task> CreateUserWithMetadata(User user) - { + { var arguments = new object[] { user }; var func = requestBuilder.BuildRestResultFuncForMethod("CreateUserWithMetadata", new Type[] { typeof(User) }); return (Task>)func(Client, arguments); - } + } - } -} + } + } namespace Refit.Tests { using Refit.Tests.RefitInternalGenerated; /// - [ExcludeFromCodeCoverage] - [DebuggerNonUserCode] + [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] + [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] + [global::System.Reflection.Obfuscation(Exclude=true)] partial class AutoGeneratedIHttpBinApi : IHttpBinApi where TResponse : class @@ -472,53 +478,55 @@ partial class AutoGeneratedIHttpBinApi /// public AutoGeneratedIHttpBinApi(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task Get(TParam param,THeader header) - { + { var arguments = new object[] { param,header }; var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] { typeof(TParam),typeof(THeader) }); return (Task)func(Client, arguments); - } + } /// public virtual Task GetQuery(TParam param) - { + { var arguments = new object[] { param }; var func = requestBuilder.BuildRestResultFuncForMethod("GetQuery", new Type[] { typeof(TParam) }); return (Task)func(Client, arguments); - } + } /// public virtual Task GetQueryWithIncludeParameterName(TParam param) - { + { var arguments = new object[] { param }; var func = requestBuilder.BuildRestResultFuncForMethod("GetQueryWithIncludeParameterName", new Type[] { typeof(TParam) }); return (Task)func(Client, arguments); - } + } /// - public virtual Task GetQuery1(TParam param) - { + public virtual Task GetQuery1 + (TParam param) + { var arguments = new object[] { param }; var func = requestBuilder.BuildRestResultFuncForMethod("GetQuery1", new Type[] { typeof(TParam) }, new Type[] { typeof(TValue) }); return (Task)func(Client, arguments); - } + } - } -} + } + } namespace Refit.Tests { using Refit.Tests.RefitInternalGenerated; /// - [ExcludeFromCodeCoverage] - [DebuggerNonUserCode] + [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] + [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] + [global::System.Reflection.Obfuscation(Exclude=true)] partial class AutoGeneratedIHttpContentApi : IHttpContentApi { /// public HttpClient Client { get; protected set; } @@ -527,37 +535,38 @@ partial class AutoGeneratedIHttpContentApi : IHttpContentApi { /// public AutoGeneratedIHttpContentApi(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task PostFileUpload(HttpContent content) - { + { var arguments = new object[] { content }; var func = requestBuilder.BuildRestResultFuncForMethod("PostFileUpload", new Type[] { typeof(HttpContent) }); return (Task)func(Client, arguments); - } + } /// public virtual Task> PostFileUploadWithMetadata(HttpContent content) - { + { var arguments = new object[] { content }; var func = requestBuilder.BuildRestResultFuncForMethod("PostFileUploadWithMetadata", new Type[] { typeof(HttpContent) }); return (Task>)func(Client, arguments); - } + } - } -} + } + } namespace Refit.Tests { using Refit.Tests.RefitInternalGenerated; /// - [ExcludeFromCodeCoverage] - [DebuggerNonUserCode] + [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] + [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] + [global::System.Reflection.Obfuscation(Exclude=true)] partial class AutoGeneratedResponseTestsIMyAliasService : ResponseTests.IMyAliasService { /// public HttpClient Client { get; protected set; } @@ -566,29 +575,30 @@ partial class AutoGeneratedResponseTestsIMyAliasService : ResponseTests.IMyAlias /// public AutoGeneratedResponseTestsIMyAliasService(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task GetTestObject() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("GetTestObject", new Type[] { }); return (Task)func(Client, arguments); - } + } - } -} + } + } namespace Refit.Tests { using Refit.Tests.RefitInternalGenerated; /// - [ExcludeFromCodeCoverage] - [DebuggerNonUserCode] + [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] + [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] + [global::System.Reflection.Obfuscation(Exclude=true)] partial class AutoGeneratedAuthenticatedClientHandlerTestsIMyAuthenticatedService : AuthenticatedClientHandlerTests.IMyAuthenticatedService { /// public HttpClient Client { get; protected set; } @@ -597,37 +607,38 @@ partial class AutoGeneratedAuthenticatedClientHandlerTestsIMyAuthenticatedServic /// public AutoGeneratedAuthenticatedClientHandlerTestsIMyAuthenticatedService(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task GetUnauthenticated() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("GetUnauthenticated", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task GetAuthenticated() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("GetAuthenticated", new Type[] { }); return (Task)func(Client, arguments); - } + } - } -} + } + } namespace Refit.Tests { using Refit.Tests.RefitInternalGenerated; /// - [ExcludeFromCodeCoverage] - [DebuggerNonUserCode] + [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] + [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] + [global::System.Reflection.Obfuscation(Exclude=true)] partial class AutoGeneratedINamespaceCollisionApi : INamespaceCollisionApi { /// public HttpClient Client { get; protected set; } @@ -636,29 +647,30 @@ partial class AutoGeneratedINamespaceCollisionApi : INamespaceCollisionApi /// public AutoGeneratedINamespaceCollisionApi(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task SomeRequest() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("SomeRequest", new Type[] { }); return (Task)func(Client, arguments); - } + } - } -} + } + } namespace Refit.Tests { using Refit.Tests.RefitInternalGenerated; /// - [ExcludeFromCodeCoverage] - [DebuggerNonUserCode] + [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] + [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] + [global::System.Reflection.Obfuscation(Exclude=true)] partial class AutoGeneratedTestNestedINestedGitHubApi : TestNested.INestedGitHubApi { /// public HttpClient Client { get; protected set; } @@ -667,85 +679,86 @@ partial class AutoGeneratedTestNestedINestedGitHubApi : TestNested.INestedGitHub /// public AutoGeneratedTestNestedINestedGitHubApi(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task GetUser(string userName) - { + { var arguments = new object[] { userName }; var func = requestBuilder.BuildRestResultFuncForMethod("GetUser", new Type[] { typeof(string) }); return (Task)func(Client, arguments); - } + } /// public virtual IObservable GetUserObservable(string userName) - { + { var arguments = new object[] { userName }; var func = requestBuilder.BuildRestResultFuncForMethod("GetUserObservable", new Type[] { typeof(string) }); return (IObservable)func(Client, arguments); - } + } /// public virtual IObservable GetUserCamelCase(string userName) - { + { var arguments = new object[] { userName }; var func = requestBuilder.BuildRestResultFuncForMethod("GetUserCamelCase", new Type[] { typeof(string) }); return (IObservable)func(Client, arguments); - } + } /// public virtual Task> GetOrgMembers(string orgName) - { + { var arguments = new object[] { orgName }; var func = requestBuilder.BuildRestResultFuncForMethod("GetOrgMembers", new Type[] { typeof(string) }); return (Task>)func(Client, arguments); - } + } /// public virtual Task FindUsers(string q) - { + { var arguments = new object[] { q }; var func = requestBuilder.BuildRestResultFuncForMethod("FindUsers", new Type[] { typeof(string) }); return (Task)func(Client, arguments); - } + } /// public virtual Task GetIndex() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("GetIndex", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual IObservable GetIndexObservable() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("GetIndexObservable", new Type[] { }); return (IObservable)func(Client, arguments); - } + } /// public virtual Task NothingToSeeHere() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("NothingToSeeHere", new Type[] { }); return (Task)func(Client, arguments); - } + } - } -} + } + } namespace Refit.Tests { using Refit.Tests.RefitInternalGenerated; /// - [ExcludeFromCodeCoverage] - [DebuggerNonUserCode] + [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] + [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] + [global::System.Reflection.Obfuscation(Exclude=true)] partial class AutoGeneratedINonGenericInterfaceWithGenericMethod : INonGenericInterfaceWithGenericMethod { /// public HttpClient Client { get; protected set; } @@ -754,39 +767,42 @@ partial class AutoGeneratedINonGenericInterfaceWithGenericMethod : INonGenericIn /// public AutoGeneratedINonGenericInterfaceWithGenericMethod(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// - public virtual Task PostMessage(T message) + public virtual Task PostMessage + (T message) where T : IMessage - { + { var arguments = new object[] { message }; var func = requestBuilder.BuildRestResultFuncForMethod("PostMessage", new Type[] { typeof(T) }, new Type[] { typeof(T) }); return (Task)func(Client, arguments); - } + } /// - public virtual Task PostMessage(T message,U param1,V param2) + public virtual Task PostMessage + (T message,U param1,V param2) where T : IMessage where U : T - { + { var arguments = new object[] { message,param1,param2 }; var func = requestBuilder.BuildRestResultFuncForMethod("PostMessage", new Type[] { typeof(T),typeof(U),typeof(V) }, new Type[] { typeof(T), typeof(U), typeof(V) }); return (Task)func(Client, arguments); - } + } - } -} + } + } namespace Refit.Tests { using Refit.Tests.RefitInternalGenerated; /// - [ExcludeFromCodeCoverage] - [DebuggerNonUserCode] + [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] + [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] + [global::System.Reflection.Obfuscation(Exclude=true)] partial class AutoGeneratedINpmJs : INpmJs { /// public HttpClient Client { get; protected set; } @@ -795,29 +811,30 @@ partial class AutoGeneratedINpmJs : INpmJs { /// public AutoGeneratedINpmJs(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task GetCongruence() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("GetCongruence", new Type[] { }); return (Task)func(Client, arguments); - } + } - } -} + } + } namespace Refit.Tests { using Refit.Tests.RefitInternalGenerated; /// - [ExcludeFromCodeCoverage] - [DebuggerNonUserCode] + [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] + [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] + [global::System.Reflection.Obfuscation(Exclude=true)] partial class AutoGeneratedIRequestBin : IRequestBin { /// public HttpClient Client { get; protected set; } @@ -826,61 +843,63 @@ partial class AutoGeneratedIRequestBin : IRequestBin { /// public AutoGeneratedIRequestBin(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task Post() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("Post", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task PostRawStringDefault(string str) - { + { var arguments = new object[] { str }; var func = requestBuilder.BuildRestResultFuncForMethod("PostRawStringDefault", new Type[] { typeof(string) }); return (Task)func(Client, arguments); - } + } /// public virtual Task PostRawStringJson(string str) - { + { var arguments = new object[] { str }; var func = requestBuilder.BuildRestResultFuncForMethod("PostRawStringJson", new Type[] { typeof(string) }); return (Task)func(Client, arguments); - } + } /// public virtual Task PostRawStringUrlEncoded(string str) - { + { var arguments = new object[] { str }; var func = requestBuilder.BuildRestResultFuncForMethod("PostRawStringUrlEncoded", new Type[] { typeof(string) }); return (Task)func(Client, arguments); - } + } /// - public virtual Task PostGeneric(T param) - { + public virtual Task PostGeneric + (T param) + { var arguments = new object[] { param }; var func = requestBuilder.BuildRestResultFuncForMethod("PostGeneric", new Type[] { typeof(T) }, new Type[] { typeof(T) }); return (Task)func(Client, arguments); - } + } - } -} + } + } namespace Refit.Tests { using Refit.Tests.RefitInternalGenerated; /// - [ExcludeFromCodeCoverage] - [DebuggerNonUserCode] + [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] + [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] + [global::System.Reflection.Obfuscation(Exclude=true)] partial class AutoGeneratedIRunscopeApi : IRunscopeApi { /// public HttpClient Client { get; protected set; } @@ -889,109 +908,110 @@ partial class AutoGeneratedIRunscopeApi : IRunscopeApi { /// public AutoGeneratedIRunscopeApi(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task UploadStream(Stream stream) - { + { var arguments = new object[] { stream }; var func = requestBuilder.BuildRestResultFuncForMethod("UploadStream", new Type[] { typeof(Stream) }); return (Task)func(Client, arguments); - } + } /// public virtual Task UploadStreamPart(StreamPart stream) - { + { var arguments = new object[] { stream }; var func = requestBuilder.BuildRestResultFuncForMethod("UploadStreamPart", new Type[] { typeof(StreamPart) }); return (Task)func(Client, arguments); - } + } /// public virtual Task UploadBytes(byte[] bytes) - { + { var arguments = new object[] { bytes }; var func = requestBuilder.BuildRestResultFuncForMethod("UploadBytes", new Type[] { typeof(byte[]) }); return (Task)func(Client, arguments); - } + } /// public virtual Task UploadBytesPart(ByteArrayPart bytes) - { + { var arguments = new object[] { bytes }; var func = requestBuilder.BuildRestResultFuncForMethod("UploadBytesPart", new Type[] { typeof(ByteArrayPart) }); return (Task)func(Client, arguments); - } + } /// public virtual Task UploadString(string someString) - { + { var arguments = new object[] { someString }; var func = requestBuilder.BuildRestResultFuncForMethod("UploadString", new Type[] { typeof(string) }); return (Task)func(Client, arguments); - } + } /// public virtual Task UploadFileInfo(IEnumerable fileInfos,FileInfo anotherFile) - { + { var arguments = new object[] { fileInfos,anotherFile }; var func = requestBuilder.BuildRestResultFuncForMethod("UploadFileInfo", new Type[] { typeof(IEnumerable),typeof(FileInfo) }); return (Task)func(Client, arguments); - } + } /// public virtual Task UploadFileInfoPart(IEnumerable fileInfos,FileInfoPart anotherFile) - { + { var arguments = new object[] { fileInfos,anotherFile }; var func = requestBuilder.BuildRestResultFuncForMethod("UploadFileInfoPart", new Type[] { typeof(IEnumerable),typeof(FileInfoPart) }); return (Task)func(Client, arguments); - } + } /// public virtual Task UploadJsonObject(ModelObject theObject) - { + { var arguments = new object[] { theObject }; var func = requestBuilder.BuildRestResultFuncForMethod("UploadJsonObject", new Type[] { typeof(ModelObject) }); return (Task)func(Client, arguments); - } + } /// public virtual Task UploadJsonObjects(IEnumerable theObjects) - { + { var arguments = new object[] { theObjects }; var func = requestBuilder.BuildRestResultFuncForMethod("UploadJsonObjects", new Type[] { typeof(IEnumerable) }); return (Task)func(Client, arguments); - } + } /// public virtual Task UploadMixedObjects(IEnumerable theObjects,AnotherModel anotherModel,FileInfo aFile,AnEnum anEnum,string aString,int anInt) - { + { var arguments = new object[] { theObjects,anotherModel,aFile,anEnum,aString,anInt }; var func = requestBuilder.BuildRestResultFuncForMethod("UploadMixedObjects", new Type[] { typeof(IEnumerable),typeof(AnotherModel),typeof(FileInfo),typeof(AnEnum),typeof(string),typeof(int) }); return (Task)func(Client, arguments); - } + } /// public virtual Task UploadHttpContent(HttpContent content) - { + { var arguments = new object[] { content }; var func = requestBuilder.BuildRestResultFuncForMethod("UploadHttpContent", new Type[] { typeof(HttpContent) }); return (Task)func(Client, arguments); - } + } - } -} + } + } namespace AutoGeneratedIServiceWithoutNamespace { using Refit.Tests.RefitInternalGenerated; /// - [ExcludeFromCodeCoverage] - [DebuggerNonUserCode] + [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] + [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] + [global::System.Reflection.Obfuscation(Exclude=true)] partial class AutoGeneratedIServiceWithoutNamespace : IServiceWithoutNamespace { /// public HttpClient Client { get; protected set; } @@ -1000,37 +1020,38 @@ partial class AutoGeneratedIServiceWithoutNamespace : IServiceWithoutNamespace /// public AutoGeneratedIServiceWithoutNamespace(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task GetRoot() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("GetRoot", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task PostRoot() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("PostRoot", new Type[] { }); return (Task)func(Client, arguments); - } + } - } -} + } + } namespace Refit.Tests { using Refit.Tests.RefitInternalGenerated; /// - [ExcludeFromCodeCoverage] - [DebuggerNonUserCode] + [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] + [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] + [global::System.Reflection.Obfuscation(Exclude=true)] partial class AutoGeneratedIStreamApi : IStreamApi { /// public HttpClient Client { get; protected set; } @@ -1039,37 +1060,38 @@ partial class AutoGeneratedIStreamApi : IStreamApi { /// public AutoGeneratedIStreamApi(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task GetRemoteFile(string filename) - { + { var arguments = new object[] { filename }; var func = requestBuilder.BuildRestResultFuncForMethod("GetRemoteFile", new Type[] { typeof(string) }); return (Task)func(Client, arguments); - } + } /// public virtual Task> GetRemoteFileWithMetadata(string filename) - { + { var arguments = new object[] { filename }; var func = requestBuilder.BuildRestResultFuncForMethod("GetRemoteFileWithMetadata", new Type[] { typeof(string) }); return (Task>)func(Client, arguments); - } + } - } -} + } + } namespace Refit.Tests { using Refit.Tests.RefitInternalGenerated; /// - [ExcludeFromCodeCoverage] - [DebuggerNonUserCode] + [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] + [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] + [global::System.Reflection.Obfuscation(Exclude=true)] partial class AutoGeneratedIUseOverloadedGenericMethods : IUseOverloadedGenericMethods where TResponse : class @@ -1082,77 +1104,81 @@ partial class AutoGeneratedIUseOverloadedGenericMethods public AutoGeneratedIUseOverloadedGenericMethods(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task Get() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task Get(TParam param,THeader header) - { + { var arguments = new object[] { param,header }; var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] { typeof(TParam),typeof(THeader) }); return (Task)func(Client, arguments); - } + } /// public virtual Task Get(THeader param,TParam header) - { + { var arguments = new object[] { param,header }; var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] { typeof(THeader),typeof(TParam) }); return (Task)func(Client, arguments); - } + } /// public virtual Task Get(int httpstatuscode) - { + { var arguments = new object[] { httpstatuscode }; var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] { typeof(int) }); return (Task)func(Client, arguments); - } + } /// - public virtual Task Get(int someVal) - { + public virtual Task Get + (int someVal) + { var arguments = new object[] { someVal }; var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] { typeof(int) }, new Type[] { typeof(TValue) }); return (Task)func(Client, arguments); - } + } /// - public virtual Task Get(TInput input) - { + public virtual Task Get + (TInput input) + { var arguments = new object[] { input }; var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] { typeof(TInput) }, new Type[] { typeof(TValue), typeof(TInput) }); return (Task)func(Client, arguments); - } + } /// - public virtual Task Get(TInput1 input1,TInput2 input2) - { + public virtual Task Get + (TInput1 input1,TInput2 input2) + { var arguments = new object[] { input1,input2 }; var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] { typeof(TInput1),typeof(TInput2) }, new Type[] { typeof(TInput1), typeof(TInput2) }); return (Task)func(Client, arguments); - } + } - } -} + } + } namespace Refit.Tests { using Refit.Tests.RefitInternalGenerated; /// - [ExcludeFromCodeCoverage] - [DebuggerNonUserCode] + [global::System.Diagnostics.CodeAnalysis.ExcludeFromCodeCoverage] + [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] + [global::System.Reflection.Obfuscation(Exclude=true)] partial class AutoGeneratedIUseOverloadedMethods : IUseOverloadedMethods { /// public HttpClient Client { get; protected set; } @@ -1161,25 +1187,25 @@ partial class AutoGeneratedIUseOverloadedMethods : IUseOverloadedMethods /// public AutoGeneratedIUseOverloadedMethods(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task Get() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task Get(int httpstatuscode) - { + { var arguments = new object[] { httpstatuscode }; var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] { typeof(int) }); return (Task)func(Client, arguments); - } + } - } -} + } + } From c1d02f0bdd147d2ba5f41974e4c8e5e0525743e3 Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Sat, 16 Feb 2019 16:53:01 -0500 Subject: [PATCH 08/11] Fix template formatting --- .../GeneratedInterfaceStubTemplate.mustache | 18 +- Refit.Tests/RefitStubs.Net46.cs | 572 +++++++++--------- Refit.Tests/RefitStubs.NetCore2.cs | 572 +++++++++--------- 3 files changed, 581 insertions(+), 581 deletions(-) diff --git a/InterfaceStubGenerator.Core/GeneratedInterfaceStubTemplate.mustache b/InterfaceStubGenerator.Core/GeneratedInterfaceStubTemplate.mustache index a4f942dc8..3b458f4cc 100644 --- a/InterfaceStubGenerator.Core/GeneratedInterfaceStubTemplate.mustache +++ b/InterfaceStubGenerator.Core/GeneratedInterfaceStubTemplate.mustache @@ -46,7 +46,8 @@ namespace {{Namespace}} {{#ConstraintClauses}} {{.}} {{/ConstraintClauses}} - { + + { /// public HttpClient Client { get; protected set; } readonly IRequestBuilder requestBuilder; @@ -54,18 +55,18 @@ namespace {{Namespace}} /// public AutoGenerated{{GeneratedClassSuffix}}(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } - {{#MethodList}} + /// public virtual {{ReturnType}} {{Name}}{{#MethodTypeParameters}}<{{.}}> {{/MethodTypeParameters}}({{ArgumentListWithTypes}}) {{#MethodConstraintClauses}} {{.}} {{/MethodConstraintClauses}} - { + { {{#IsRefitMethod}} var arguments = new object[] { {{ArgumentList}} }; var func = requestBuilder.BuildRestResultFuncForMethod("{{Name}}", new Type[] { {{ArgumentTypesList}} }{{#MethodTypeParameterList}}, new Type[] { {{.}} }{{/MethodTypeParameterList}}); @@ -74,10 +75,9 @@ namespace {{Namespace}} {{^IsRefitMethod}} throw new NotImplementedException("Either this method has no Refit HTTP method attribute or you've used something other than a string literal for the 'path' argument."); {{/IsRefitMethod}} - } - + } {{/MethodList}} - } - } + } +} {{/ClassList}} diff --git a/Refit.Tests/RefitStubs.Net46.cs b/Refit.Tests/RefitStubs.Net46.cs index 8abebad36..85a1f2dfa 100644 --- a/Refit.Tests/RefitStubs.Net46.cs +++ b/Refit.Tests/RefitStubs.Net46.cs @@ -59,7 +59,8 @@ namespace Refit.Tests [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] [global::System.Reflection.Obfuscation(Exclude=true)] - partial class AutoGeneratedIAmARefitInterfaceButNobodyUsesMe : IAmARefitInterfaceButNobodyUsesMe { + partial class AutoGeneratedIAmARefitInterfaceButNobodyUsesMe : IAmARefitInterfaceButNobodyUsesMe + { /// public HttpClient Client { get; protected set; } readonly IRequestBuilder requestBuilder; @@ -67,50 +68,49 @@ partial class AutoGeneratedIAmARefitInterfaceButNobodyUsesMe : IAmARefitInterfac /// public AutoGeneratedIAmARefitInterfaceButNobodyUsesMe(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task RefitMethod() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("RefitMethod", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task AnotherRefitMethod() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("AnotherRefitMethod", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task NoConstantsAllowed() - { + { throw new NotImplementedException("Either this method has no Refit HTTP method attribute or you've used something other than a string literal for the 'path' argument."); - } + } /// public virtual Task SpacesShouldntBreakMe() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("SpacesShouldntBreakMe", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task ReservedWordsForParameterNames(int @int,string @string,float @long) - { + { var arguments = new object[] { @int,@string,@long }; var func = requestBuilder.BuildRestResultFuncForMethod("ReservedWordsForParameterNames", new Type[] { typeof(int),typeof(string),typeof(float) }); return (Task)func(Client, arguments); - } - - } - } + } + } +} namespace Refit.Tests { @@ -121,7 +121,8 @@ namespace Refit.Tests [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] [global::System.Reflection.Obfuscation(Exclude=true)] - partial class AutoGeneratedIAmHalfRefit : IAmHalfRefit { + partial class AutoGeneratedIAmHalfRefit : IAmHalfRefit + { /// public HttpClient Client { get; protected set; } readonly IRequestBuilder requestBuilder; @@ -129,26 +130,25 @@ partial class AutoGeneratedIAmHalfRefit : IAmHalfRefit { /// public AutoGeneratedIAmHalfRefit(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task Post() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("Post", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task Get() - { + { throw new NotImplementedException("Either this method has no Refit HTTP method attribute or you've used something other than a string literal for the 'path' argument."); - } - - } - } + } + } +} namespace Refit.Tests { @@ -159,7 +159,8 @@ namespace Refit.Tests [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] [global::System.Reflection.Obfuscation(Exclude=true)] - partial class AutoGeneratedIApiWithDecimal : IApiWithDecimal { + partial class AutoGeneratedIApiWithDecimal : IApiWithDecimal + { /// public HttpClient Client { get; protected set; } readonly IRequestBuilder requestBuilder; @@ -167,20 +168,19 @@ partial class AutoGeneratedIApiWithDecimal : IApiWithDecimal { /// public AutoGeneratedIApiWithDecimal(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task GetWithDecimal(decimal value) - { + { var arguments = new object[] { value }; var func = requestBuilder.BuildRestResultFuncForMethod("GetWithDecimal", new Type[] { typeof(decimal) }); return (Task)func(Client, arguments); - } - - } - } + } + } +} namespace Refit.Tests { @@ -191,7 +191,8 @@ namespace Refit.Tests [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] [global::System.Reflection.Obfuscation(Exclude=true)] - partial class AutoGeneratedIBodylessApi : IBodylessApi { + partial class AutoGeneratedIBodylessApi : IBodylessApi + { /// public HttpClient Client { get; protected set; } readonly IRequestBuilder requestBuilder; @@ -199,36 +200,35 @@ partial class AutoGeneratedIBodylessApi : IBodylessApi { /// public AutoGeneratedIBodylessApi(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task Post() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("Post", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task Get() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task Head() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("Head", new Type[] { }); return (Task)func(Client, arguments); - } - - } - } + } + } +} namespace Refit.Tests { @@ -242,7 +242,8 @@ namespace Refit.Tests partial class AutoGeneratedIBoringCrudApi : IBoringCrudApi where T : class - { + + { /// public HttpClient Client { get; protected set; } readonly IRequestBuilder requestBuilder; @@ -250,52 +251,51 @@ partial class AutoGeneratedIBoringCrudApi /// public AutoGeneratedIBoringCrudApi(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task Create(T paylod) - { + { var arguments = new object[] { paylod }; var func = requestBuilder.BuildRestResultFuncForMethod("Create", new Type[] { typeof(T) }); return (Task)func(Client, arguments); - } + } /// public virtual Task> ReadAll() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("ReadAll", new Type[] { }); return (Task>)func(Client, arguments); - } + } /// public virtual Task ReadOne(TKey key) - { + { var arguments = new object[] { key }; var func = requestBuilder.BuildRestResultFuncForMethod("ReadOne", new Type[] { typeof(TKey) }); return (Task)func(Client, arguments); - } + } /// public virtual Task Update(TKey key,T payload) - { + { var arguments = new object[] { key,payload }; var func = requestBuilder.BuildRestResultFuncForMethod("Update", new Type[] { typeof(TKey),typeof(T) }); return (Task)func(Client, arguments); - } + } /// public virtual Task Delete(TKey key) - { + { var arguments = new object[] { key }; var func = requestBuilder.BuildRestResultFuncForMethod("Delete", new Type[] { typeof(TKey) }); return (Task)func(Client, arguments); - } - - } - } + } + } +} namespace Refit.Tests { @@ -306,7 +306,8 @@ namespace Refit.Tests [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] [global::System.Reflection.Obfuscation(Exclude=true)] - partial class AutoGeneratedIBrokenWebApi : IBrokenWebApi { + partial class AutoGeneratedIBrokenWebApi : IBrokenWebApi + { /// public HttpClient Client { get; protected set; } readonly IRequestBuilder requestBuilder; @@ -314,20 +315,19 @@ partial class AutoGeneratedIBrokenWebApi : IBrokenWebApi { /// public AutoGeneratedIBrokenWebApi(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task PostAValue(string derp) - { + { var arguments = new object[] { derp }; var func = requestBuilder.BuildRestResultFuncForMethod("PostAValue", new Type[] { typeof(string) }); return (Task)func(Client, arguments); - } - - } - } + } + } +} namespace Refit.Tests { @@ -338,7 +338,8 @@ namespace Refit.Tests [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] [global::System.Reflection.Obfuscation(Exclude=true)] - partial class AutoGeneratedIGitHubApi : IGitHubApi { + partial class AutoGeneratedIGitHubApi : IGitHubApi + { /// public HttpClient Client { get; protected set; } readonly IRequestBuilder requestBuilder; @@ -346,116 +347,115 @@ partial class AutoGeneratedIGitHubApi : IGitHubApi { /// public AutoGeneratedIGitHubApi(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task GetUser(string userName) - { + { var arguments = new object[] { userName }; var func = requestBuilder.BuildRestResultFuncForMethod("GetUser", new Type[] { typeof(string) }); return (Task)func(Client, arguments); - } + } /// public virtual IObservable GetUserObservable(string userName) - { + { var arguments = new object[] { userName }; var func = requestBuilder.BuildRestResultFuncForMethod("GetUserObservable", new Type[] { typeof(string) }); return (IObservable)func(Client, arguments); - } + } /// public virtual IObservable GetUserCamelCase(string userName) - { + { var arguments = new object[] { userName }; var func = requestBuilder.BuildRestResultFuncForMethod("GetUserCamelCase", new Type[] { typeof(string) }); return (IObservable)func(Client, arguments); - } + } /// public virtual Task> GetOrgMembers(string orgName) - { + { var arguments = new object[] { orgName }; var func = requestBuilder.BuildRestResultFuncForMethod("GetOrgMembers", new Type[] { typeof(string) }); return (Task>)func(Client, arguments); - } + } /// public virtual Task FindUsers(string q) - { + { var arguments = new object[] { q }; var func = requestBuilder.BuildRestResultFuncForMethod("FindUsers", new Type[] { typeof(string) }); return (Task)func(Client, arguments); - } + } /// public virtual Task GetIndex() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("GetIndex", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual IObservable GetIndexObservable() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("GetIndexObservable", new Type[] { }); return (IObservable)func(Client, arguments); - } + } /// public virtual Task NothingToSeeHere() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("NothingToSeeHere", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task> NothingToSeeHereWithMetadata() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("NothingToSeeHereWithMetadata", new Type[] { }); return (Task>)func(Client, arguments); - } + } /// public virtual Task> GetUserWithMetadata(string userName) - { + { var arguments = new object[] { userName }; var func = requestBuilder.BuildRestResultFuncForMethod("GetUserWithMetadata", new Type[] { typeof(string) }); return (Task>)func(Client, arguments); - } + } /// public virtual IObservable> GetUserObservableWithMetadata(string userName) - { + { var arguments = new object[] { userName }; var func = requestBuilder.BuildRestResultFuncForMethod("GetUserObservableWithMetadata", new Type[] { typeof(string) }); return (IObservable>)func(Client, arguments); - } + } /// public virtual Task CreateUser(User user) - { + { var arguments = new object[] { user }; var func = requestBuilder.BuildRestResultFuncForMethod("CreateUser", new Type[] { typeof(User) }); return (Task)func(Client, arguments); - } + } /// public virtual Task> CreateUserWithMetadata(User user) - { + { var arguments = new object[] { user }; var func = requestBuilder.BuildRestResultFuncForMethod("CreateUserWithMetadata", new Type[] { typeof(User) }); return (Task>)func(Client, arguments); - } - - } - } + } + } +} namespace Refit.Tests { @@ -470,7 +470,8 @@ partial class AutoGeneratedIHttpBinApi : IHttpBinApi where TResponse : class where THeader : struct - { + + { /// public HttpClient Client { get; protected set; } readonly IRequestBuilder requestBuilder; @@ -478,45 +479,44 @@ partial class AutoGeneratedIHttpBinApi /// public AutoGeneratedIHttpBinApi(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task Get(TParam param,THeader header) - { + { var arguments = new object[] { param,header }; var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] { typeof(TParam),typeof(THeader) }); return (Task)func(Client, arguments); - } + } /// public virtual Task GetQuery(TParam param) - { + { var arguments = new object[] { param }; var func = requestBuilder.BuildRestResultFuncForMethod("GetQuery", new Type[] { typeof(TParam) }); return (Task)func(Client, arguments); - } + } /// public virtual Task GetQueryWithIncludeParameterName(TParam param) - { + { var arguments = new object[] { param }; var func = requestBuilder.BuildRestResultFuncForMethod("GetQueryWithIncludeParameterName", new Type[] { typeof(TParam) }); return (Task)func(Client, arguments); - } + } /// public virtual Task GetQuery1 (TParam param) - { + { var arguments = new object[] { param }; var func = requestBuilder.BuildRestResultFuncForMethod("GetQuery1", new Type[] { typeof(TParam) }, new Type[] { typeof(TValue) }); return (Task)func(Client, arguments); - } - - } - } + } + } +} namespace Refit.Tests { @@ -527,7 +527,8 @@ namespace Refit.Tests [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] [global::System.Reflection.Obfuscation(Exclude=true)] - partial class AutoGeneratedIHttpContentApi : IHttpContentApi { + partial class AutoGeneratedIHttpContentApi : IHttpContentApi + { /// public HttpClient Client { get; protected set; } readonly IRequestBuilder requestBuilder; @@ -535,28 +536,27 @@ partial class AutoGeneratedIHttpContentApi : IHttpContentApi { /// public AutoGeneratedIHttpContentApi(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task PostFileUpload(HttpContent content) - { + { var arguments = new object[] { content }; var func = requestBuilder.BuildRestResultFuncForMethod("PostFileUpload", new Type[] { typeof(HttpContent) }); return (Task)func(Client, arguments); - } + } /// public virtual Task> PostFileUploadWithMetadata(HttpContent content) - { + { var arguments = new object[] { content }; var func = requestBuilder.BuildRestResultFuncForMethod("PostFileUploadWithMetadata", new Type[] { typeof(HttpContent) }); return (Task>)func(Client, arguments); - } - - } - } + } + } +} namespace Refit.Tests { @@ -567,7 +567,8 @@ namespace Refit.Tests [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] [global::System.Reflection.Obfuscation(Exclude=true)] - partial class AutoGeneratedResponseTestsIMyAliasService : ResponseTests.IMyAliasService { + partial class AutoGeneratedResponseTestsIMyAliasService : ResponseTests.IMyAliasService + { /// public HttpClient Client { get; protected set; } readonly IRequestBuilder requestBuilder; @@ -575,20 +576,19 @@ partial class AutoGeneratedResponseTestsIMyAliasService : ResponseTests.IMyAlias /// public AutoGeneratedResponseTestsIMyAliasService(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task GetTestObject() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("GetTestObject", new Type[] { }); return (Task)func(Client, arguments); - } - - } - } + } + } +} namespace Refit.Tests { @@ -599,7 +599,8 @@ namespace Refit.Tests [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] [global::System.Reflection.Obfuscation(Exclude=true)] - partial class AutoGeneratedAuthenticatedClientHandlerTestsIMyAuthenticatedService : AuthenticatedClientHandlerTests.IMyAuthenticatedService { + partial class AutoGeneratedAuthenticatedClientHandlerTestsIMyAuthenticatedService : AuthenticatedClientHandlerTests.IMyAuthenticatedService + { /// public HttpClient Client { get; protected set; } readonly IRequestBuilder requestBuilder; @@ -607,28 +608,27 @@ partial class AutoGeneratedAuthenticatedClientHandlerTestsIMyAuthenticatedServic /// public AutoGeneratedAuthenticatedClientHandlerTestsIMyAuthenticatedService(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task GetUnauthenticated() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("GetUnauthenticated", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task GetAuthenticated() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("GetAuthenticated", new Type[] { }); return (Task)func(Client, arguments); - } - - } - } + } + } +} namespace Refit.Tests { @@ -639,7 +639,8 @@ namespace Refit.Tests [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] [global::System.Reflection.Obfuscation(Exclude=true)] - partial class AutoGeneratedINamespaceCollisionApi : INamespaceCollisionApi { + partial class AutoGeneratedINamespaceCollisionApi : INamespaceCollisionApi + { /// public HttpClient Client { get; protected set; } readonly IRequestBuilder requestBuilder; @@ -647,20 +648,19 @@ partial class AutoGeneratedINamespaceCollisionApi : INamespaceCollisionApi /// public AutoGeneratedINamespaceCollisionApi(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task SomeRequest() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("SomeRequest", new Type[] { }); return (Task)func(Client, arguments); - } - - } - } + } + } +} namespace Refit.Tests { @@ -671,7 +671,8 @@ namespace Refit.Tests [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] [global::System.Reflection.Obfuscation(Exclude=true)] - partial class AutoGeneratedTestNestedINestedGitHubApi : TestNested.INestedGitHubApi { + partial class AutoGeneratedTestNestedINestedGitHubApi : TestNested.INestedGitHubApi + { /// public HttpClient Client { get; protected set; } readonly IRequestBuilder requestBuilder; @@ -679,76 +680,75 @@ partial class AutoGeneratedTestNestedINestedGitHubApi : TestNested.INestedGitHub /// public AutoGeneratedTestNestedINestedGitHubApi(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task GetUser(string userName) - { + { var arguments = new object[] { userName }; var func = requestBuilder.BuildRestResultFuncForMethod("GetUser", new Type[] { typeof(string) }); return (Task)func(Client, arguments); - } + } /// public virtual IObservable GetUserObservable(string userName) - { + { var arguments = new object[] { userName }; var func = requestBuilder.BuildRestResultFuncForMethod("GetUserObservable", new Type[] { typeof(string) }); return (IObservable)func(Client, arguments); - } + } /// public virtual IObservable GetUserCamelCase(string userName) - { + { var arguments = new object[] { userName }; var func = requestBuilder.BuildRestResultFuncForMethod("GetUserCamelCase", new Type[] { typeof(string) }); return (IObservable)func(Client, arguments); - } + } /// public virtual Task> GetOrgMembers(string orgName) - { + { var arguments = new object[] { orgName }; var func = requestBuilder.BuildRestResultFuncForMethod("GetOrgMembers", new Type[] { typeof(string) }); return (Task>)func(Client, arguments); - } + } /// public virtual Task FindUsers(string q) - { + { var arguments = new object[] { q }; var func = requestBuilder.BuildRestResultFuncForMethod("FindUsers", new Type[] { typeof(string) }); return (Task)func(Client, arguments); - } + } /// public virtual Task GetIndex() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("GetIndex", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual IObservable GetIndexObservable() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("GetIndexObservable", new Type[] { }); return (IObservable)func(Client, arguments); - } + } /// public virtual Task NothingToSeeHere() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("NothingToSeeHere", new Type[] { }); return (Task)func(Client, arguments); - } - - } - } + } + } +} namespace Refit.Tests { @@ -759,7 +759,8 @@ namespace Refit.Tests [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] [global::System.Reflection.Obfuscation(Exclude=true)] - partial class AutoGeneratedINonGenericInterfaceWithGenericMethod : INonGenericInterfaceWithGenericMethod { + partial class AutoGeneratedINonGenericInterfaceWithGenericMethod : INonGenericInterfaceWithGenericMethod + { /// public HttpClient Client { get; protected set; } readonly IRequestBuilder requestBuilder; @@ -767,32 +768,31 @@ partial class AutoGeneratedINonGenericInterfaceWithGenericMethod : INonGenericIn /// public AutoGeneratedINonGenericInterfaceWithGenericMethod(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task PostMessage (T message) where T : IMessage - { + { var arguments = new object[] { message }; var func = requestBuilder.BuildRestResultFuncForMethod("PostMessage", new Type[] { typeof(T) }, new Type[] { typeof(T) }); return (Task)func(Client, arguments); - } + } /// public virtual Task PostMessage (T message,U param1,V param2) where T : IMessage where U : T - { + { var arguments = new object[] { message,param1,param2 }; var func = requestBuilder.BuildRestResultFuncForMethod("PostMessage", new Type[] { typeof(T),typeof(U),typeof(V) }, new Type[] { typeof(T), typeof(U), typeof(V) }); return (Task)func(Client, arguments); - } - - } - } + } + } +} namespace Refit.Tests { @@ -803,7 +803,8 @@ namespace Refit.Tests [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] [global::System.Reflection.Obfuscation(Exclude=true)] - partial class AutoGeneratedINpmJs : INpmJs { + partial class AutoGeneratedINpmJs : INpmJs + { /// public HttpClient Client { get; protected set; } readonly IRequestBuilder requestBuilder; @@ -811,20 +812,19 @@ partial class AutoGeneratedINpmJs : INpmJs { /// public AutoGeneratedINpmJs(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task GetCongruence() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("GetCongruence", new Type[] { }); return (Task)func(Client, arguments); - } - - } - } + } + } +} namespace Refit.Tests { @@ -835,7 +835,8 @@ namespace Refit.Tests [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] [global::System.Reflection.Obfuscation(Exclude=true)] - partial class AutoGeneratedIRequestBin : IRequestBin { + partial class AutoGeneratedIRequestBin : IRequestBin + { /// public HttpClient Client { get; protected set; } readonly IRequestBuilder requestBuilder; @@ -843,53 +844,52 @@ partial class AutoGeneratedIRequestBin : IRequestBin { /// public AutoGeneratedIRequestBin(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task Post() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("Post", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task PostRawStringDefault(string str) - { + { var arguments = new object[] { str }; var func = requestBuilder.BuildRestResultFuncForMethod("PostRawStringDefault", new Type[] { typeof(string) }); return (Task)func(Client, arguments); - } + } /// public virtual Task PostRawStringJson(string str) - { + { var arguments = new object[] { str }; var func = requestBuilder.BuildRestResultFuncForMethod("PostRawStringJson", new Type[] { typeof(string) }); return (Task)func(Client, arguments); - } + } /// public virtual Task PostRawStringUrlEncoded(string str) - { + { var arguments = new object[] { str }; var func = requestBuilder.BuildRestResultFuncForMethod("PostRawStringUrlEncoded", new Type[] { typeof(string) }); return (Task)func(Client, arguments); - } + } /// public virtual Task PostGeneric (T param) - { + { var arguments = new object[] { param }; var func = requestBuilder.BuildRestResultFuncForMethod("PostGeneric", new Type[] { typeof(T) }, new Type[] { typeof(T) }); return (Task)func(Client, arguments); - } - - } - } + } + } +} namespace Refit.Tests { @@ -900,7 +900,8 @@ namespace Refit.Tests [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] [global::System.Reflection.Obfuscation(Exclude=true)] - partial class AutoGeneratedIRunscopeApi : IRunscopeApi { + partial class AutoGeneratedIRunscopeApi : IRunscopeApi + { /// public HttpClient Client { get; protected set; } readonly IRequestBuilder requestBuilder; @@ -908,100 +909,99 @@ partial class AutoGeneratedIRunscopeApi : IRunscopeApi { /// public AutoGeneratedIRunscopeApi(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task UploadStream(Stream stream) - { + { var arguments = new object[] { stream }; var func = requestBuilder.BuildRestResultFuncForMethod("UploadStream", new Type[] { typeof(Stream) }); return (Task)func(Client, arguments); - } + } /// public virtual Task UploadStreamPart(StreamPart stream) - { + { var arguments = new object[] { stream }; var func = requestBuilder.BuildRestResultFuncForMethod("UploadStreamPart", new Type[] { typeof(StreamPart) }); return (Task)func(Client, arguments); - } + } /// public virtual Task UploadBytes(byte[] bytes) - { + { var arguments = new object[] { bytes }; var func = requestBuilder.BuildRestResultFuncForMethod("UploadBytes", new Type[] { typeof(byte[]) }); return (Task)func(Client, arguments); - } + } /// public virtual Task UploadBytesPart(ByteArrayPart bytes) - { + { var arguments = new object[] { bytes }; var func = requestBuilder.BuildRestResultFuncForMethod("UploadBytesPart", new Type[] { typeof(ByteArrayPart) }); return (Task)func(Client, arguments); - } + } /// public virtual Task UploadString(string someString) - { + { var arguments = new object[] { someString }; var func = requestBuilder.BuildRestResultFuncForMethod("UploadString", new Type[] { typeof(string) }); return (Task)func(Client, arguments); - } + } /// public virtual Task UploadFileInfo(IEnumerable fileInfos,FileInfo anotherFile) - { + { var arguments = new object[] { fileInfos,anotherFile }; var func = requestBuilder.BuildRestResultFuncForMethod("UploadFileInfo", new Type[] { typeof(IEnumerable),typeof(FileInfo) }); return (Task)func(Client, arguments); - } + } /// public virtual Task UploadFileInfoPart(IEnumerable fileInfos,FileInfoPart anotherFile) - { + { var arguments = new object[] { fileInfos,anotherFile }; var func = requestBuilder.BuildRestResultFuncForMethod("UploadFileInfoPart", new Type[] { typeof(IEnumerable),typeof(FileInfoPart) }); return (Task)func(Client, arguments); - } + } /// public virtual Task UploadJsonObject(ModelObject theObject) - { + { var arguments = new object[] { theObject }; var func = requestBuilder.BuildRestResultFuncForMethod("UploadJsonObject", new Type[] { typeof(ModelObject) }); return (Task)func(Client, arguments); - } + } /// public virtual Task UploadJsonObjects(IEnumerable theObjects) - { + { var arguments = new object[] { theObjects }; var func = requestBuilder.BuildRestResultFuncForMethod("UploadJsonObjects", new Type[] { typeof(IEnumerable) }); return (Task)func(Client, arguments); - } + } /// public virtual Task UploadMixedObjects(IEnumerable theObjects,AnotherModel anotherModel,FileInfo aFile,AnEnum anEnum,string aString,int anInt) - { + { var arguments = new object[] { theObjects,anotherModel,aFile,anEnum,aString,anInt }; var func = requestBuilder.BuildRestResultFuncForMethod("UploadMixedObjects", new Type[] { typeof(IEnumerable),typeof(AnotherModel),typeof(FileInfo),typeof(AnEnum),typeof(string),typeof(int) }); return (Task)func(Client, arguments); - } + } /// public virtual Task UploadHttpContent(HttpContent content) - { + { var arguments = new object[] { content }; var func = requestBuilder.BuildRestResultFuncForMethod("UploadHttpContent", new Type[] { typeof(HttpContent) }); return (Task)func(Client, arguments); - } - - } - } + } + } +} namespace AutoGeneratedIServiceWithoutNamespace { @@ -1012,7 +1012,8 @@ namespace AutoGeneratedIServiceWithoutNamespace [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] [global::System.Reflection.Obfuscation(Exclude=true)] - partial class AutoGeneratedIServiceWithoutNamespace : IServiceWithoutNamespace { + partial class AutoGeneratedIServiceWithoutNamespace : IServiceWithoutNamespace + { /// public HttpClient Client { get; protected set; } readonly IRequestBuilder requestBuilder; @@ -1020,28 +1021,27 @@ partial class AutoGeneratedIServiceWithoutNamespace : IServiceWithoutNamespace /// public AutoGeneratedIServiceWithoutNamespace(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task GetRoot() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("GetRoot", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task PostRoot() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("PostRoot", new Type[] { }); return (Task)func(Client, arguments); - } - - } - } + } + } +} namespace Refit.Tests { @@ -1052,7 +1052,8 @@ namespace Refit.Tests [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] [global::System.Reflection.Obfuscation(Exclude=true)] - partial class AutoGeneratedIStreamApi : IStreamApi { + partial class AutoGeneratedIStreamApi : IStreamApi + { /// public HttpClient Client { get; protected set; } readonly IRequestBuilder requestBuilder; @@ -1060,28 +1061,27 @@ partial class AutoGeneratedIStreamApi : IStreamApi { /// public AutoGeneratedIStreamApi(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task GetRemoteFile(string filename) - { + { var arguments = new object[] { filename }; var func = requestBuilder.BuildRestResultFuncForMethod("GetRemoteFile", new Type[] { typeof(string) }); return (Task)func(Client, arguments); - } + } /// public virtual Task> GetRemoteFileWithMetadata(string filename) - { + { var arguments = new object[] { filename }; var func = requestBuilder.BuildRestResultFuncForMethod("GetRemoteFileWithMetadata", new Type[] { typeof(string) }); return (Task>)func(Client, arguments); - } - - } - } + } + } +} namespace Refit.Tests { @@ -1096,7 +1096,8 @@ partial class AutoGeneratedIUseOverloadedGenericMethods where TResponse : class where THeader : struct - { + + { /// public HttpClient Client { get; protected set; } readonly IRequestBuilder requestBuilder; @@ -1104,71 +1105,70 @@ partial class AutoGeneratedIUseOverloadedGenericMethods public AutoGeneratedIUseOverloadedGenericMethods(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task Get() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task Get(TParam param,THeader header) - { + { var arguments = new object[] { param,header }; var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] { typeof(TParam),typeof(THeader) }); return (Task)func(Client, arguments); - } + } /// public virtual Task Get(THeader param,TParam header) - { + { var arguments = new object[] { param,header }; var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] { typeof(THeader),typeof(TParam) }); return (Task)func(Client, arguments); - } + } /// public virtual Task Get(int httpstatuscode) - { + { var arguments = new object[] { httpstatuscode }; var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] { typeof(int) }); return (Task)func(Client, arguments); - } + } /// public virtual Task Get (int someVal) - { + { var arguments = new object[] { someVal }; var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] { typeof(int) }, new Type[] { typeof(TValue) }); return (Task)func(Client, arguments); - } + } /// public virtual Task Get (TInput input) - { + { var arguments = new object[] { input }; var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] { typeof(TInput) }, new Type[] { typeof(TValue), typeof(TInput) }); return (Task)func(Client, arguments); - } + } /// public virtual Task Get (TInput1 input1,TInput2 input2) - { + { var arguments = new object[] { input1,input2 }; var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] { typeof(TInput1),typeof(TInput2) }, new Type[] { typeof(TInput1), typeof(TInput2) }); return (Task)func(Client, arguments); - } - - } - } + } + } +} namespace Refit.Tests { @@ -1179,7 +1179,8 @@ namespace Refit.Tests [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] [global::System.Reflection.Obfuscation(Exclude=true)] - partial class AutoGeneratedIUseOverloadedMethods : IUseOverloadedMethods { + partial class AutoGeneratedIUseOverloadedMethods : IUseOverloadedMethods + { /// public HttpClient Client { get; protected set; } readonly IRequestBuilder requestBuilder; @@ -1187,25 +1188,24 @@ partial class AutoGeneratedIUseOverloadedMethods : IUseOverloadedMethods /// public AutoGeneratedIUseOverloadedMethods(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task Get() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task Get(int httpstatuscode) - { + { var arguments = new object[] { httpstatuscode }; var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] { typeof(int) }); return (Task)func(Client, arguments); - } - - } - } + } + } +} diff --git a/Refit.Tests/RefitStubs.NetCore2.cs b/Refit.Tests/RefitStubs.NetCore2.cs index 8abebad36..85a1f2dfa 100644 --- a/Refit.Tests/RefitStubs.NetCore2.cs +++ b/Refit.Tests/RefitStubs.NetCore2.cs @@ -59,7 +59,8 @@ namespace Refit.Tests [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] [global::System.Reflection.Obfuscation(Exclude=true)] - partial class AutoGeneratedIAmARefitInterfaceButNobodyUsesMe : IAmARefitInterfaceButNobodyUsesMe { + partial class AutoGeneratedIAmARefitInterfaceButNobodyUsesMe : IAmARefitInterfaceButNobodyUsesMe + { /// public HttpClient Client { get; protected set; } readonly IRequestBuilder requestBuilder; @@ -67,50 +68,49 @@ partial class AutoGeneratedIAmARefitInterfaceButNobodyUsesMe : IAmARefitInterfac /// public AutoGeneratedIAmARefitInterfaceButNobodyUsesMe(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task RefitMethod() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("RefitMethod", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task AnotherRefitMethod() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("AnotherRefitMethod", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task NoConstantsAllowed() - { + { throw new NotImplementedException("Either this method has no Refit HTTP method attribute or you've used something other than a string literal for the 'path' argument."); - } + } /// public virtual Task SpacesShouldntBreakMe() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("SpacesShouldntBreakMe", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task ReservedWordsForParameterNames(int @int,string @string,float @long) - { + { var arguments = new object[] { @int,@string,@long }; var func = requestBuilder.BuildRestResultFuncForMethod("ReservedWordsForParameterNames", new Type[] { typeof(int),typeof(string),typeof(float) }); return (Task)func(Client, arguments); - } - - } - } + } + } +} namespace Refit.Tests { @@ -121,7 +121,8 @@ namespace Refit.Tests [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] [global::System.Reflection.Obfuscation(Exclude=true)] - partial class AutoGeneratedIAmHalfRefit : IAmHalfRefit { + partial class AutoGeneratedIAmHalfRefit : IAmHalfRefit + { /// public HttpClient Client { get; protected set; } readonly IRequestBuilder requestBuilder; @@ -129,26 +130,25 @@ partial class AutoGeneratedIAmHalfRefit : IAmHalfRefit { /// public AutoGeneratedIAmHalfRefit(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task Post() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("Post", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task Get() - { + { throw new NotImplementedException("Either this method has no Refit HTTP method attribute or you've used something other than a string literal for the 'path' argument."); - } - - } - } + } + } +} namespace Refit.Tests { @@ -159,7 +159,8 @@ namespace Refit.Tests [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] [global::System.Reflection.Obfuscation(Exclude=true)] - partial class AutoGeneratedIApiWithDecimal : IApiWithDecimal { + partial class AutoGeneratedIApiWithDecimal : IApiWithDecimal + { /// public HttpClient Client { get; protected set; } readonly IRequestBuilder requestBuilder; @@ -167,20 +168,19 @@ partial class AutoGeneratedIApiWithDecimal : IApiWithDecimal { /// public AutoGeneratedIApiWithDecimal(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task GetWithDecimal(decimal value) - { + { var arguments = new object[] { value }; var func = requestBuilder.BuildRestResultFuncForMethod("GetWithDecimal", new Type[] { typeof(decimal) }); return (Task)func(Client, arguments); - } - - } - } + } + } +} namespace Refit.Tests { @@ -191,7 +191,8 @@ namespace Refit.Tests [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] [global::System.Reflection.Obfuscation(Exclude=true)] - partial class AutoGeneratedIBodylessApi : IBodylessApi { + partial class AutoGeneratedIBodylessApi : IBodylessApi + { /// public HttpClient Client { get; protected set; } readonly IRequestBuilder requestBuilder; @@ -199,36 +200,35 @@ partial class AutoGeneratedIBodylessApi : IBodylessApi { /// public AutoGeneratedIBodylessApi(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task Post() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("Post", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task Get() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task Head() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("Head", new Type[] { }); return (Task)func(Client, arguments); - } - - } - } + } + } +} namespace Refit.Tests { @@ -242,7 +242,8 @@ namespace Refit.Tests partial class AutoGeneratedIBoringCrudApi : IBoringCrudApi where T : class - { + + { /// public HttpClient Client { get; protected set; } readonly IRequestBuilder requestBuilder; @@ -250,52 +251,51 @@ partial class AutoGeneratedIBoringCrudApi /// public AutoGeneratedIBoringCrudApi(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task Create(T paylod) - { + { var arguments = new object[] { paylod }; var func = requestBuilder.BuildRestResultFuncForMethod("Create", new Type[] { typeof(T) }); return (Task)func(Client, arguments); - } + } /// public virtual Task> ReadAll() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("ReadAll", new Type[] { }); return (Task>)func(Client, arguments); - } + } /// public virtual Task ReadOne(TKey key) - { + { var arguments = new object[] { key }; var func = requestBuilder.BuildRestResultFuncForMethod("ReadOne", new Type[] { typeof(TKey) }); return (Task)func(Client, arguments); - } + } /// public virtual Task Update(TKey key,T payload) - { + { var arguments = new object[] { key,payload }; var func = requestBuilder.BuildRestResultFuncForMethod("Update", new Type[] { typeof(TKey),typeof(T) }); return (Task)func(Client, arguments); - } + } /// public virtual Task Delete(TKey key) - { + { var arguments = new object[] { key }; var func = requestBuilder.BuildRestResultFuncForMethod("Delete", new Type[] { typeof(TKey) }); return (Task)func(Client, arguments); - } - - } - } + } + } +} namespace Refit.Tests { @@ -306,7 +306,8 @@ namespace Refit.Tests [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] [global::System.Reflection.Obfuscation(Exclude=true)] - partial class AutoGeneratedIBrokenWebApi : IBrokenWebApi { + partial class AutoGeneratedIBrokenWebApi : IBrokenWebApi + { /// public HttpClient Client { get; protected set; } readonly IRequestBuilder requestBuilder; @@ -314,20 +315,19 @@ partial class AutoGeneratedIBrokenWebApi : IBrokenWebApi { /// public AutoGeneratedIBrokenWebApi(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task PostAValue(string derp) - { + { var arguments = new object[] { derp }; var func = requestBuilder.BuildRestResultFuncForMethod("PostAValue", new Type[] { typeof(string) }); return (Task)func(Client, arguments); - } - - } - } + } + } +} namespace Refit.Tests { @@ -338,7 +338,8 @@ namespace Refit.Tests [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] [global::System.Reflection.Obfuscation(Exclude=true)] - partial class AutoGeneratedIGitHubApi : IGitHubApi { + partial class AutoGeneratedIGitHubApi : IGitHubApi + { /// public HttpClient Client { get; protected set; } readonly IRequestBuilder requestBuilder; @@ -346,116 +347,115 @@ partial class AutoGeneratedIGitHubApi : IGitHubApi { /// public AutoGeneratedIGitHubApi(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task GetUser(string userName) - { + { var arguments = new object[] { userName }; var func = requestBuilder.BuildRestResultFuncForMethod("GetUser", new Type[] { typeof(string) }); return (Task)func(Client, arguments); - } + } /// public virtual IObservable GetUserObservable(string userName) - { + { var arguments = new object[] { userName }; var func = requestBuilder.BuildRestResultFuncForMethod("GetUserObservable", new Type[] { typeof(string) }); return (IObservable)func(Client, arguments); - } + } /// public virtual IObservable GetUserCamelCase(string userName) - { + { var arguments = new object[] { userName }; var func = requestBuilder.BuildRestResultFuncForMethod("GetUserCamelCase", new Type[] { typeof(string) }); return (IObservable)func(Client, arguments); - } + } /// public virtual Task> GetOrgMembers(string orgName) - { + { var arguments = new object[] { orgName }; var func = requestBuilder.BuildRestResultFuncForMethod("GetOrgMembers", new Type[] { typeof(string) }); return (Task>)func(Client, arguments); - } + } /// public virtual Task FindUsers(string q) - { + { var arguments = new object[] { q }; var func = requestBuilder.BuildRestResultFuncForMethod("FindUsers", new Type[] { typeof(string) }); return (Task)func(Client, arguments); - } + } /// public virtual Task GetIndex() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("GetIndex", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual IObservable GetIndexObservable() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("GetIndexObservable", new Type[] { }); return (IObservable)func(Client, arguments); - } + } /// public virtual Task NothingToSeeHere() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("NothingToSeeHere", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task> NothingToSeeHereWithMetadata() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("NothingToSeeHereWithMetadata", new Type[] { }); return (Task>)func(Client, arguments); - } + } /// public virtual Task> GetUserWithMetadata(string userName) - { + { var arguments = new object[] { userName }; var func = requestBuilder.BuildRestResultFuncForMethod("GetUserWithMetadata", new Type[] { typeof(string) }); return (Task>)func(Client, arguments); - } + } /// public virtual IObservable> GetUserObservableWithMetadata(string userName) - { + { var arguments = new object[] { userName }; var func = requestBuilder.BuildRestResultFuncForMethod("GetUserObservableWithMetadata", new Type[] { typeof(string) }); return (IObservable>)func(Client, arguments); - } + } /// public virtual Task CreateUser(User user) - { + { var arguments = new object[] { user }; var func = requestBuilder.BuildRestResultFuncForMethod("CreateUser", new Type[] { typeof(User) }); return (Task)func(Client, arguments); - } + } /// public virtual Task> CreateUserWithMetadata(User user) - { + { var arguments = new object[] { user }; var func = requestBuilder.BuildRestResultFuncForMethod("CreateUserWithMetadata", new Type[] { typeof(User) }); return (Task>)func(Client, arguments); - } - - } - } + } + } +} namespace Refit.Tests { @@ -470,7 +470,8 @@ partial class AutoGeneratedIHttpBinApi : IHttpBinApi where TResponse : class where THeader : struct - { + + { /// public HttpClient Client { get; protected set; } readonly IRequestBuilder requestBuilder; @@ -478,45 +479,44 @@ partial class AutoGeneratedIHttpBinApi /// public AutoGeneratedIHttpBinApi(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task Get(TParam param,THeader header) - { + { var arguments = new object[] { param,header }; var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] { typeof(TParam),typeof(THeader) }); return (Task)func(Client, arguments); - } + } /// public virtual Task GetQuery(TParam param) - { + { var arguments = new object[] { param }; var func = requestBuilder.BuildRestResultFuncForMethod("GetQuery", new Type[] { typeof(TParam) }); return (Task)func(Client, arguments); - } + } /// public virtual Task GetQueryWithIncludeParameterName(TParam param) - { + { var arguments = new object[] { param }; var func = requestBuilder.BuildRestResultFuncForMethod("GetQueryWithIncludeParameterName", new Type[] { typeof(TParam) }); return (Task)func(Client, arguments); - } + } /// public virtual Task GetQuery1 (TParam param) - { + { var arguments = new object[] { param }; var func = requestBuilder.BuildRestResultFuncForMethod("GetQuery1", new Type[] { typeof(TParam) }, new Type[] { typeof(TValue) }); return (Task)func(Client, arguments); - } - - } - } + } + } +} namespace Refit.Tests { @@ -527,7 +527,8 @@ namespace Refit.Tests [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] [global::System.Reflection.Obfuscation(Exclude=true)] - partial class AutoGeneratedIHttpContentApi : IHttpContentApi { + partial class AutoGeneratedIHttpContentApi : IHttpContentApi + { /// public HttpClient Client { get; protected set; } readonly IRequestBuilder requestBuilder; @@ -535,28 +536,27 @@ partial class AutoGeneratedIHttpContentApi : IHttpContentApi { /// public AutoGeneratedIHttpContentApi(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task PostFileUpload(HttpContent content) - { + { var arguments = new object[] { content }; var func = requestBuilder.BuildRestResultFuncForMethod("PostFileUpload", new Type[] { typeof(HttpContent) }); return (Task)func(Client, arguments); - } + } /// public virtual Task> PostFileUploadWithMetadata(HttpContent content) - { + { var arguments = new object[] { content }; var func = requestBuilder.BuildRestResultFuncForMethod("PostFileUploadWithMetadata", new Type[] { typeof(HttpContent) }); return (Task>)func(Client, arguments); - } - - } - } + } + } +} namespace Refit.Tests { @@ -567,7 +567,8 @@ namespace Refit.Tests [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] [global::System.Reflection.Obfuscation(Exclude=true)] - partial class AutoGeneratedResponseTestsIMyAliasService : ResponseTests.IMyAliasService { + partial class AutoGeneratedResponseTestsIMyAliasService : ResponseTests.IMyAliasService + { /// public HttpClient Client { get; protected set; } readonly IRequestBuilder requestBuilder; @@ -575,20 +576,19 @@ partial class AutoGeneratedResponseTestsIMyAliasService : ResponseTests.IMyAlias /// public AutoGeneratedResponseTestsIMyAliasService(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task GetTestObject() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("GetTestObject", new Type[] { }); return (Task)func(Client, arguments); - } - - } - } + } + } +} namespace Refit.Tests { @@ -599,7 +599,8 @@ namespace Refit.Tests [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] [global::System.Reflection.Obfuscation(Exclude=true)] - partial class AutoGeneratedAuthenticatedClientHandlerTestsIMyAuthenticatedService : AuthenticatedClientHandlerTests.IMyAuthenticatedService { + partial class AutoGeneratedAuthenticatedClientHandlerTestsIMyAuthenticatedService : AuthenticatedClientHandlerTests.IMyAuthenticatedService + { /// public HttpClient Client { get; protected set; } readonly IRequestBuilder requestBuilder; @@ -607,28 +608,27 @@ partial class AutoGeneratedAuthenticatedClientHandlerTestsIMyAuthenticatedServic /// public AutoGeneratedAuthenticatedClientHandlerTestsIMyAuthenticatedService(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task GetUnauthenticated() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("GetUnauthenticated", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task GetAuthenticated() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("GetAuthenticated", new Type[] { }); return (Task)func(Client, arguments); - } - - } - } + } + } +} namespace Refit.Tests { @@ -639,7 +639,8 @@ namespace Refit.Tests [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] [global::System.Reflection.Obfuscation(Exclude=true)] - partial class AutoGeneratedINamespaceCollisionApi : INamespaceCollisionApi { + partial class AutoGeneratedINamespaceCollisionApi : INamespaceCollisionApi + { /// public HttpClient Client { get; protected set; } readonly IRequestBuilder requestBuilder; @@ -647,20 +648,19 @@ partial class AutoGeneratedINamespaceCollisionApi : INamespaceCollisionApi /// public AutoGeneratedINamespaceCollisionApi(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task SomeRequest() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("SomeRequest", new Type[] { }); return (Task)func(Client, arguments); - } - - } - } + } + } +} namespace Refit.Tests { @@ -671,7 +671,8 @@ namespace Refit.Tests [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] [global::System.Reflection.Obfuscation(Exclude=true)] - partial class AutoGeneratedTestNestedINestedGitHubApi : TestNested.INestedGitHubApi { + partial class AutoGeneratedTestNestedINestedGitHubApi : TestNested.INestedGitHubApi + { /// public HttpClient Client { get; protected set; } readonly IRequestBuilder requestBuilder; @@ -679,76 +680,75 @@ partial class AutoGeneratedTestNestedINestedGitHubApi : TestNested.INestedGitHub /// public AutoGeneratedTestNestedINestedGitHubApi(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task GetUser(string userName) - { + { var arguments = new object[] { userName }; var func = requestBuilder.BuildRestResultFuncForMethod("GetUser", new Type[] { typeof(string) }); return (Task)func(Client, arguments); - } + } /// public virtual IObservable GetUserObservable(string userName) - { + { var arguments = new object[] { userName }; var func = requestBuilder.BuildRestResultFuncForMethod("GetUserObservable", new Type[] { typeof(string) }); return (IObservable)func(Client, arguments); - } + } /// public virtual IObservable GetUserCamelCase(string userName) - { + { var arguments = new object[] { userName }; var func = requestBuilder.BuildRestResultFuncForMethod("GetUserCamelCase", new Type[] { typeof(string) }); return (IObservable)func(Client, arguments); - } + } /// public virtual Task> GetOrgMembers(string orgName) - { + { var arguments = new object[] { orgName }; var func = requestBuilder.BuildRestResultFuncForMethod("GetOrgMembers", new Type[] { typeof(string) }); return (Task>)func(Client, arguments); - } + } /// public virtual Task FindUsers(string q) - { + { var arguments = new object[] { q }; var func = requestBuilder.BuildRestResultFuncForMethod("FindUsers", new Type[] { typeof(string) }); return (Task)func(Client, arguments); - } + } /// public virtual Task GetIndex() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("GetIndex", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual IObservable GetIndexObservable() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("GetIndexObservable", new Type[] { }); return (IObservable)func(Client, arguments); - } + } /// public virtual Task NothingToSeeHere() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("NothingToSeeHere", new Type[] { }); return (Task)func(Client, arguments); - } - - } - } + } + } +} namespace Refit.Tests { @@ -759,7 +759,8 @@ namespace Refit.Tests [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] [global::System.Reflection.Obfuscation(Exclude=true)] - partial class AutoGeneratedINonGenericInterfaceWithGenericMethod : INonGenericInterfaceWithGenericMethod { + partial class AutoGeneratedINonGenericInterfaceWithGenericMethod : INonGenericInterfaceWithGenericMethod + { /// public HttpClient Client { get; protected set; } readonly IRequestBuilder requestBuilder; @@ -767,32 +768,31 @@ partial class AutoGeneratedINonGenericInterfaceWithGenericMethod : INonGenericIn /// public AutoGeneratedINonGenericInterfaceWithGenericMethod(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task PostMessage (T message) where T : IMessage - { + { var arguments = new object[] { message }; var func = requestBuilder.BuildRestResultFuncForMethod("PostMessage", new Type[] { typeof(T) }, new Type[] { typeof(T) }); return (Task)func(Client, arguments); - } + } /// public virtual Task PostMessage (T message,U param1,V param2) where T : IMessage where U : T - { + { var arguments = new object[] { message,param1,param2 }; var func = requestBuilder.BuildRestResultFuncForMethod("PostMessage", new Type[] { typeof(T),typeof(U),typeof(V) }, new Type[] { typeof(T), typeof(U), typeof(V) }); return (Task)func(Client, arguments); - } - - } - } + } + } +} namespace Refit.Tests { @@ -803,7 +803,8 @@ namespace Refit.Tests [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] [global::System.Reflection.Obfuscation(Exclude=true)] - partial class AutoGeneratedINpmJs : INpmJs { + partial class AutoGeneratedINpmJs : INpmJs + { /// public HttpClient Client { get; protected set; } readonly IRequestBuilder requestBuilder; @@ -811,20 +812,19 @@ partial class AutoGeneratedINpmJs : INpmJs { /// public AutoGeneratedINpmJs(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task GetCongruence() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("GetCongruence", new Type[] { }); return (Task)func(Client, arguments); - } - - } - } + } + } +} namespace Refit.Tests { @@ -835,7 +835,8 @@ namespace Refit.Tests [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] [global::System.Reflection.Obfuscation(Exclude=true)] - partial class AutoGeneratedIRequestBin : IRequestBin { + partial class AutoGeneratedIRequestBin : IRequestBin + { /// public HttpClient Client { get; protected set; } readonly IRequestBuilder requestBuilder; @@ -843,53 +844,52 @@ partial class AutoGeneratedIRequestBin : IRequestBin { /// public AutoGeneratedIRequestBin(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task Post() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("Post", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task PostRawStringDefault(string str) - { + { var arguments = new object[] { str }; var func = requestBuilder.BuildRestResultFuncForMethod("PostRawStringDefault", new Type[] { typeof(string) }); return (Task)func(Client, arguments); - } + } /// public virtual Task PostRawStringJson(string str) - { + { var arguments = new object[] { str }; var func = requestBuilder.BuildRestResultFuncForMethod("PostRawStringJson", new Type[] { typeof(string) }); return (Task)func(Client, arguments); - } + } /// public virtual Task PostRawStringUrlEncoded(string str) - { + { var arguments = new object[] { str }; var func = requestBuilder.BuildRestResultFuncForMethod("PostRawStringUrlEncoded", new Type[] { typeof(string) }); return (Task)func(Client, arguments); - } + } /// public virtual Task PostGeneric (T param) - { + { var arguments = new object[] { param }; var func = requestBuilder.BuildRestResultFuncForMethod("PostGeneric", new Type[] { typeof(T) }, new Type[] { typeof(T) }); return (Task)func(Client, arguments); - } - - } - } + } + } +} namespace Refit.Tests { @@ -900,7 +900,8 @@ namespace Refit.Tests [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] [global::System.Reflection.Obfuscation(Exclude=true)] - partial class AutoGeneratedIRunscopeApi : IRunscopeApi { + partial class AutoGeneratedIRunscopeApi : IRunscopeApi + { /// public HttpClient Client { get; protected set; } readonly IRequestBuilder requestBuilder; @@ -908,100 +909,99 @@ partial class AutoGeneratedIRunscopeApi : IRunscopeApi { /// public AutoGeneratedIRunscopeApi(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task UploadStream(Stream stream) - { + { var arguments = new object[] { stream }; var func = requestBuilder.BuildRestResultFuncForMethod("UploadStream", new Type[] { typeof(Stream) }); return (Task)func(Client, arguments); - } + } /// public virtual Task UploadStreamPart(StreamPart stream) - { + { var arguments = new object[] { stream }; var func = requestBuilder.BuildRestResultFuncForMethod("UploadStreamPart", new Type[] { typeof(StreamPart) }); return (Task)func(Client, arguments); - } + } /// public virtual Task UploadBytes(byte[] bytes) - { + { var arguments = new object[] { bytes }; var func = requestBuilder.BuildRestResultFuncForMethod("UploadBytes", new Type[] { typeof(byte[]) }); return (Task)func(Client, arguments); - } + } /// public virtual Task UploadBytesPart(ByteArrayPart bytes) - { + { var arguments = new object[] { bytes }; var func = requestBuilder.BuildRestResultFuncForMethod("UploadBytesPart", new Type[] { typeof(ByteArrayPart) }); return (Task)func(Client, arguments); - } + } /// public virtual Task UploadString(string someString) - { + { var arguments = new object[] { someString }; var func = requestBuilder.BuildRestResultFuncForMethod("UploadString", new Type[] { typeof(string) }); return (Task)func(Client, arguments); - } + } /// public virtual Task UploadFileInfo(IEnumerable fileInfos,FileInfo anotherFile) - { + { var arguments = new object[] { fileInfos,anotherFile }; var func = requestBuilder.BuildRestResultFuncForMethod("UploadFileInfo", new Type[] { typeof(IEnumerable),typeof(FileInfo) }); return (Task)func(Client, arguments); - } + } /// public virtual Task UploadFileInfoPart(IEnumerable fileInfos,FileInfoPart anotherFile) - { + { var arguments = new object[] { fileInfos,anotherFile }; var func = requestBuilder.BuildRestResultFuncForMethod("UploadFileInfoPart", new Type[] { typeof(IEnumerable),typeof(FileInfoPart) }); return (Task)func(Client, arguments); - } + } /// public virtual Task UploadJsonObject(ModelObject theObject) - { + { var arguments = new object[] { theObject }; var func = requestBuilder.BuildRestResultFuncForMethod("UploadJsonObject", new Type[] { typeof(ModelObject) }); return (Task)func(Client, arguments); - } + } /// public virtual Task UploadJsonObjects(IEnumerable theObjects) - { + { var arguments = new object[] { theObjects }; var func = requestBuilder.BuildRestResultFuncForMethod("UploadJsonObjects", new Type[] { typeof(IEnumerable) }); return (Task)func(Client, arguments); - } + } /// public virtual Task UploadMixedObjects(IEnumerable theObjects,AnotherModel anotherModel,FileInfo aFile,AnEnum anEnum,string aString,int anInt) - { + { var arguments = new object[] { theObjects,anotherModel,aFile,anEnum,aString,anInt }; var func = requestBuilder.BuildRestResultFuncForMethod("UploadMixedObjects", new Type[] { typeof(IEnumerable),typeof(AnotherModel),typeof(FileInfo),typeof(AnEnum),typeof(string),typeof(int) }); return (Task)func(Client, arguments); - } + } /// public virtual Task UploadHttpContent(HttpContent content) - { + { var arguments = new object[] { content }; var func = requestBuilder.BuildRestResultFuncForMethod("UploadHttpContent", new Type[] { typeof(HttpContent) }); return (Task)func(Client, arguments); - } - - } - } + } + } +} namespace AutoGeneratedIServiceWithoutNamespace { @@ -1012,7 +1012,8 @@ namespace AutoGeneratedIServiceWithoutNamespace [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] [global::System.Reflection.Obfuscation(Exclude=true)] - partial class AutoGeneratedIServiceWithoutNamespace : IServiceWithoutNamespace { + partial class AutoGeneratedIServiceWithoutNamespace : IServiceWithoutNamespace + { /// public HttpClient Client { get; protected set; } readonly IRequestBuilder requestBuilder; @@ -1020,28 +1021,27 @@ partial class AutoGeneratedIServiceWithoutNamespace : IServiceWithoutNamespace /// public AutoGeneratedIServiceWithoutNamespace(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task GetRoot() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("GetRoot", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task PostRoot() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("PostRoot", new Type[] { }); return (Task)func(Client, arguments); - } - - } - } + } + } +} namespace Refit.Tests { @@ -1052,7 +1052,8 @@ namespace Refit.Tests [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] [global::System.Reflection.Obfuscation(Exclude=true)] - partial class AutoGeneratedIStreamApi : IStreamApi { + partial class AutoGeneratedIStreamApi : IStreamApi + { /// public HttpClient Client { get; protected set; } readonly IRequestBuilder requestBuilder; @@ -1060,28 +1061,27 @@ partial class AutoGeneratedIStreamApi : IStreamApi { /// public AutoGeneratedIStreamApi(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task GetRemoteFile(string filename) - { + { var arguments = new object[] { filename }; var func = requestBuilder.BuildRestResultFuncForMethod("GetRemoteFile", new Type[] { typeof(string) }); return (Task)func(Client, arguments); - } + } /// public virtual Task> GetRemoteFileWithMetadata(string filename) - { + { var arguments = new object[] { filename }; var func = requestBuilder.BuildRestResultFuncForMethod("GetRemoteFileWithMetadata", new Type[] { typeof(string) }); return (Task>)func(Client, arguments); - } - - } - } + } + } +} namespace Refit.Tests { @@ -1096,7 +1096,8 @@ partial class AutoGeneratedIUseOverloadedGenericMethods where TResponse : class where THeader : struct - { + + { /// public HttpClient Client { get; protected set; } readonly IRequestBuilder requestBuilder; @@ -1104,71 +1105,70 @@ partial class AutoGeneratedIUseOverloadedGenericMethods public AutoGeneratedIUseOverloadedGenericMethods(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task Get() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task Get(TParam param,THeader header) - { + { var arguments = new object[] { param,header }; var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] { typeof(TParam),typeof(THeader) }); return (Task)func(Client, arguments); - } + } /// public virtual Task Get(THeader param,TParam header) - { + { var arguments = new object[] { param,header }; var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] { typeof(THeader),typeof(TParam) }); return (Task)func(Client, arguments); - } + } /// public virtual Task Get(int httpstatuscode) - { + { var arguments = new object[] { httpstatuscode }; var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] { typeof(int) }); return (Task)func(Client, arguments); - } + } /// public virtual Task Get (int someVal) - { + { var arguments = new object[] { someVal }; var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] { typeof(int) }, new Type[] { typeof(TValue) }); return (Task)func(Client, arguments); - } + } /// public virtual Task Get (TInput input) - { + { var arguments = new object[] { input }; var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] { typeof(TInput) }, new Type[] { typeof(TValue), typeof(TInput) }); return (Task)func(Client, arguments); - } + } /// public virtual Task Get (TInput1 input1,TInput2 input2) - { + { var arguments = new object[] { input1,input2 }; var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] { typeof(TInput1),typeof(TInput2) }, new Type[] { typeof(TInput1), typeof(TInput2) }); return (Task)func(Client, arguments); - } - - } - } + } + } +} namespace Refit.Tests { @@ -1179,7 +1179,8 @@ namespace Refit.Tests [global::System.Diagnostics.DebuggerNonUserCode] [Preserve] [global::System.Reflection.Obfuscation(Exclude=true)] - partial class AutoGeneratedIUseOverloadedMethods : IUseOverloadedMethods { + partial class AutoGeneratedIUseOverloadedMethods : IUseOverloadedMethods + { /// public HttpClient Client { get; protected set; } readonly IRequestBuilder requestBuilder; @@ -1187,25 +1188,24 @@ partial class AutoGeneratedIUseOverloadedMethods : IUseOverloadedMethods /// public AutoGeneratedIUseOverloadedMethods(HttpClient client, IRequestBuilder requestBuilder) { - Client = client; - this.requestBuilder = requestBuilder; + Client = client; + this.requestBuilder = requestBuilder; } /// public virtual Task Get() - { + { var arguments = new object[] { }; var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] { }); return (Task)func(Client, arguments); - } + } /// public virtual Task Get(int httpstatuscode) - { + { var arguments = new object[] { httpstatuscode }; var func = requestBuilder.BuildRestResultFuncForMethod("Get", new Type[] { typeof(int) }); return (Task)func(Client, arguments); - } - - } - } + } + } +} From 00b9d8185b15e70103c795eea51f957f1b1e5472 Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Sat, 16 Feb 2019 17:11:56 -0500 Subject: [PATCH 09/11] Code style formatting --- InterfaceStubGenerator.App/Program.cs | 4 +- .../ContextAwareTask.cs | 8 +- .../GenerateStubsTask.cs | 4 +- .../InterfaceStubGenerator.cs | 4 +- ...rSeparatedPropertyNamesContractResolver.cs | 11 +- Refit.Tests/GitHubApi.cs | 4 +- Refit.Tests/IServiceWithoutNamespace.cs | 2 +- Refit.Tests/InterfaceStubGenerator.cs | 12 +- Refit.Tests/MethodOverloads.cs | 6 +- Refit.Tests/MultipartTests.cs | 28 ++--- Refit.Tests/ResponseTests.cs | 7 +- Refit.Tests/RestService.cs | 109 +++++++++++------- Refit.Tests/SerializedContentTests.cs | 2 +- Refit.Tests/UniqueNameTests.cs | 2 +- Refit.Tests/UseCultureAttribute.cs | 2 +- Refit.Tests/XmlContentSerializerTests.cs | 5 +- Refit/ApiException.cs | 2 +- Refit/ApiResponse.cs | 2 +- Refit/Attributes.cs | 6 +- Refit/FormValueMultimap.cs | 15 +-- Refit/JsonContentSerializer.cs | 2 +- Refit/NameValueCollection.cs | 2 +- Refit/PushStreamContent.cs | 4 +- Refit/RefitSettings.cs | 8 +- Refit/RequestBuilder.cs | 6 +- ...tBuilderImplementation.TaskToObservable.cs | 26 ++--- Refit/RequestBuilderImplementation.cs | 38 +++--- Refit/RestMethodInfo.cs | 100 ++++++++++------ Refit/RestService.cs | 10 +- Refit/UniqueName.cs | 4 +- Refit/XmlContentSerializer.cs | 9 +- Refit/targets/refit.targets | 16 +-- 32 files changed, 257 insertions(+), 203 deletions(-) diff --git a/InterfaceStubGenerator.App/Program.cs b/InterfaceStubGenerator.App/Program.cs index 465723de7..2bc26abd6 100644 --- a/InterfaceStubGenerator.App/Program.cs +++ b/InterfaceStubGenerator.App/Program.cs @@ -70,7 +70,7 @@ static int Main(string[] args) { var retryCount = 3; - retry: +retry: var file = default(FileStream); // NB: Parallel build weirdness means that we might get >1 person @@ -91,7 +91,7 @@ static int Main(string[] args) goto retry; } - using(var sw = new StreamWriter(file, Encoding.UTF8)) + using (var sw = new StreamWriter(file, Encoding.UTF8)) { sw.WriteLine(template); } diff --git a/InterfaceStubGenerator.BuildTasks/ContextAwareTask.cs b/InterfaceStubGenerator.BuildTasks/ContextAwareTask.cs index 66a4d2404..872260fa2 100644 --- a/InterfaceStubGenerator.BuildTasks/ContextAwareTask.cs +++ b/InterfaceStubGenerator.BuildTasks/ContextAwareTask.cs @@ -5,7 +5,7 @@ using System.Linq; using System.Threading.Tasks; using Task = Microsoft.Build.Utilities.Task; -#if NETCOREAPP2_0 +#if NETCOREAPP2_1 using Microsoft.Build.Framework; using System.Runtime.Loader; #endif @@ -20,7 +20,7 @@ public abstract class ContextAwareTask : Task public override bool Execute() { -#if NETCOREAPP2_0 +#if NETCOREAPP2_1 var taskAssemblyPath = new Uri(GetType().GetTypeInfo().Assembly.CodeBase).LocalPath; var ctxt = new CustomAssemblyLoader(this); var inContextAssembly = ctxt.LoadFromAssemblyPath(taskAssemblyPath); @@ -43,7 +43,7 @@ public override bool Execute() } var executeInnerMethod = innerTaskType.GetMethod(nameof(ExecuteInner), BindingFlags.Instance | BindingFlags.NonPublic); - bool result = (bool)executeInnerMethod.Invoke(innerTask, new object[0]); + var result = (bool)executeInnerMethod.Invoke(innerTask, new object[0]); foreach (var propertyPair in outputPropertiesMap) { @@ -70,7 +70,7 @@ public override bool Execute() protected abstract bool ExecuteInner(); -#if NETCOREAPP2_0 +#if NETCOREAPP2_1 private class CustomAssemblyLoader : AssemblyLoadContext { private readonly ContextAwareTask loaderTask; diff --git a/InterfaceStubGenerator.BuildTasks/GenerateStubsTask.cs b/InterfaceStubGenerator.BuildTasks/GenerateStubsTask.cs index 89e4bcdd1..99aaa7c71 100644 --- a/InterfaceStubGenerator.BuildTasks/GenerateStubsTask.cs +++ b/InterfaceStubGenerator.BuildTasks/GenerateStubsTask.cs @@ -78,7 +78,7 @@ protected override bool ExecuteInner() { var retryCount = 3; - retry: +retry: FileStream file; @@ -100,7 +100,7 @@ protected override bool ExecuteInner() goto retry; } - using(var sw = new StreamWriter(file, Encoding.UTF8)) + using (var sw = new StreamWriter(file, Encoding.UTF8)) { sw.WriteLine(template); } diff --git a/InterfaceStubGenerator.Core/InterfaceStubGenerator.cs b/InterfaceStubGenerator.Core/InterfaceStubGenerator.cs index c63900ee6..ff5444e08 100644 --- a/InterfaceStubGenerator.Core/InterfaceStubGenerator.cs +++ b/InterfaceStubGenerator.Core/InterfaceStubGenerator.cs @@ -24,7 +24,7 @@ namespace Refit.Generator // What if the Interface is in another module? (since we copy usings, should be fine) public class InterfaceStubGenerator { - static readonly HashSet httpMethodAttributeNames = new HashSet( + static readonly HashSet HttpMethodAttributeNames = new HashSet( new[] { "Get", "Head", "Post", "Put", "Delete", "Patch", "Options" } .SelectMany(x => new[] { "{0}", "{0}Attribute" }.Select(f => string.Format(f, x)))); @@ -210,7 +210,7 @@ public bool HasRefitHttpMethodAttribute(MethodDeclarationSyntax method) // but what if somebody is dumb and uses a constant? // Could be turtles all the way down. return method.AttributeLists.SelectMany(a => a.Attributes) - .Any(a => httpMethodAttributeNames.Contains(a.Name.ToString().Split('.').Last()) && + .Any(a => HttpMethodAttributeNames.Contains(a.Name.ToString().Split('.').Last()) && a.ArgumentList.Arguments.Count == 1 && a.ArgumentList.Arguments[0].Expression.Kind() == SyntaxKind.StringLiteralExpression); } diff --git a/Refit.Tests/DeliminatorSeparatedPropertyNamesContractResolver.cs b/Refit.Tests/DeliminatorSeparatedPropertyNamesContractResolver.cs index f902be210..bc4007756 100644 --- a/Refit.Tests/DeliminatorSeparatedPropertyNamesContractResolver.cs +++ b/Refit.Tests/DeliminatorSeparatedPropertyNamesContractResolver.cs @@ -1,4 +1,4 @@ -using System.Collections.Generic; +using System.Collections.Generic; using System.Text; using System; using System.Globalization; @@ -20,8 +20,10 @@ protected override string ResolvePropertyName(string propertyName) var parts = new List(); var currentWord = new StringBuilder(); - foreach (var c in propertyName.ToCharArray()) { - if (Char.IsUpper(c) && currentWord.Length > 0) { + foreach (var c in propertyName.ToCharArray()) + { + if (Char.IsUpper(c) && currentWord.Length > 0) + { parts.Add(currentWord.ToString()); currentWord.Clear(); } @@ -29,7 +31,8 @@ protected override string ResolvePropertyName(string propertyName) currentWord.Append(char.ToLower(c)); } - if (currentWord.Length > 0) { + if (currentWord.Length > 0) + { parts.Add(currentWord.ToString()); } diff --git a/Refit.Tests/GitHubApi.cs b/Refit.Tests/GitHubApi.cs index 2339eb924..52fd10923 100644 --- a/Refit.Tests/GitHubApi.cs +++ b/Refit.Tests/GitHubApi.cs @@ -61,7 +61,7 @@ public interface IGitHubApi [Get("/users/{userName}")] IObservable GetUserCamelCase(string userName); - + [Get("/orgs/{orgname}/members")] Task> GetOrgMembers(string orgName); @@ -106,7 +106,7 @@ public interface INestedGitHubApi [Get("/users/{userName}")] IObservable GetUserCamelCase(string userName); - + [Get("/orgs/{orgname}/members")] Task> GetOrgMembers(string orgName); diff --git a/Refit.Tests/IServiceWithoutNamespace.cs b/Refit.Tests/IServiceWithoutNamespace.cs index 64a3e85f0..e82cccc34 100644 --- a/Refit.Tests/IServiceWithoutNamespace.cs +++ b/Refit.Tests/IServiceWithoutNamespace.cs @@ -8,7 +8,7 @@ interface IServiceWithoutNamespace { [Get("/")] Task GetRoot(); - + [Post("/")] Task PostRoot(); } diff --git a/Refit.Tests/InterfaceStubGenerator.cs b/Refit.Tests/InterfaceStubGenerator.cs index 9dc0e6b49..12bea541e 100644 --- a/Refit.Tests/InterfaceStubGenerator.cs +++ b/Refit.Tests/InterfaceStubGenerator.cs @@ -92,7 +92,7 @@ public void GenerateClassInfoForInterfaceSmokeTest() Assert.Equal("IGitHubApi", result.InterfaceName); Assert.Equal("IGitHubApi", result.GeneratedClassSuffix); } - + [Fact] public void GenerateClassInfoForNestedInterfaceSmokeTest() { @@ -104,14 +104,14 @@ public void GenerateClassInfoForNestedInterfaceSmokeTest() .First(x => x.Identifier.ValueText == "INestedGitHubApi"); var result = fixture.GenerateClassInfoForInterface(input); - - Assert.Equal("TestNested.INestedGitHubApi",result.InterfaceName); - Assert.Equal("TestNestedINestedGitHubApi",result.GeneratedClassSuffix); + + Assert.Equal("TestNested.INestedGitHubApi", result.InterfaceName); + Assert.Equal("TestNestedINestedGitHubApi", result.GeneratedClassSuffix); Assert.Equal(8, result.MethodList.Count); Assert.Equal("GetUser", result.MethodList[0].Name); Assert.Equal("string userName", result.MethodList[0].ArgumentListWithTypes); } - + [Fact] public void GenerateTemplateInfoForInterfaceListSmokeTest() { @@ -169,7 +169,7 @@ public interface IAmARefitInterfaceButNobodyUsesMe [Get(ThisIsDumbButMightHappen.PeopleDoWeirdStuff)] Task NoConstantsAllowed(); - [Get ("spaces-shouldnt-break-me")] + [Get("spaces-shouldnt-break-me")] Task SpacesShouldntBreakMe(); // We don't need an explicit test for this because if it isn't supported we can't compile diff --git a/Refit.Tests/MethodOverloads.cs b/Refit.Tests/MethodOverloads.cs index 051d1e0b0..86c947cd0 100644 --- a/Refit.Tests/MethodOverloads.cs +++ b/Refit.Tests/MethodOverloads.cs @@ -106,7 +106,7 @@ public async Task GenericMethodOverloadTest2() mockHttp.Expect(HttpMethod.Get, "https://httpbin.org/status/403") .Respond(HttpStatusCode.Forbidden); - + var fixture = RestService.For>("https://httpbin.org/", settings); @@ -197,7 +197,7 @@ public async Task GenericMethodOverloadTest6() .Respond("application/json", "generic-output"); var fixture = RestService.For>("https://httpbin.org/", settings); - + var result = await fixture.Get(99); Assert.Equal("generic-output", result); @@ -224,7 +224,7 @@ public async Task GenericMethodOverloadTest7() var fixture = RestService.For>("https://httpbin.org/", settings); - await fixture.Get("str", 3); + await fixture.Get("str", 3); mockHttp.VerifyNoOutstandingExpectation(); } diff --git a/Refit.Tests/MultipartTests.cs b/Refit.Tests/MultipartTests.cs index 2d851776c..fb1599d83 100644 --- a/Refit.Tests/MultipartTests.cs +++ b/Refit.Tests/MultipartTests.cs @@ -99,8 +99,8 @@ public async Task MultipartUploadShouldWorkWithStream() Assert.Equal("stream", parts[0].Headers.ContentDisposition.Name); Assert.Equal("stream", parts[0].Headers.ContentDisposition.FileName); - using(var str = await parts[0].ReadAsStreamAsync()) - using(var src = GetTestFileStream("Test Files/Test.pdf")) + using (var str = await parts[0].ReadAsStreamAsync()) + using (var src = GetTestFileStream("Test Files/Test.pdf")) { Assert.True(StreamsEqual(src, str)); } @@ -178,7 +178,7 @@ public async Task MultipartUploadShouldWorkWithFileInfo() { Assert.True(StreamsEqual(src, str)); } - + Assert.Equal("fileInfos", parts[1].Headers.ContentDisposition.Name); Assert.Equal(name, parts[1].Headers.ContentDisposition.FileName); Assert.Null(parts[1].Headers.ContentType); @@ -204,7 +204,7 @@ public async Task MultipartUploadShouldWorkWithFileInfo() { HttpMessageHandlerFactory = () => handler }; - + try { using (var stream = GetTestFileStream("Test Files/Test.pdf")) @@ -213,7 +213,7 @@ public async Task MultipartUploadShouldWorkWithFileInfo() await stream.CopyToAsync(outStream); await outStream.FlushAsync(); outStream.Close(); - + var fixture = RestService.For(BaseAddress, settings); var result = await fixture.UploadFileInfo(new[] { new FileInfo(fileName), new FileInfo(fileName) }, new FileInfo(fileName)); } @@ -251,7 +251,7 @@ public async Task MultipartUploadShouldWorkWithString() HttpMessageHandlerFactory = () => handler }; - + var fixture = RestService.For(BaseAddress, settings); var result = await fixture.UploadString(text); } @@ -389,7 +389,7 @@ public async Task MultipartUploadShouldWorkWithFileInfoPart() outStream.Close(); var fixture = RestService.For(BaseAddress, settings); - var result = await fixture.UploadFileInfoPart(new[] + var result = await fixture.UploadFileInfoPart(new[] { new FileInfoPart(new FileInfo(fileName), "test-fileinfopart.pdf", "application/pdf"), new FileInfoPart(new FileInfo(fileName), "test-fileinfopart2.pdf", contentType: null) @@ -417,7 +417,7 @@ public async Task MultipartUploadShouldWorkWithAnObject(Type contentSerializerTy Property1 = "M1.prop1", Property2 = "M1.prop2" }; - + var handler = new MockHttpMessageHandler { Asserts = async content => @@ -477,7 +477,7 @@ public async Task MultipartUploadShouldWorkWithObjects(Type contentSerializerTyp Assert.Equal("theObjects", parts[0].Headers.ContentDisposition.Name); Assert.Null(parts[0].Headers.ContentDisposition.FileName); Assert.Equal(mediaType, parts[0].Headers.ContentType.MediaType); - var result0 = await serializer.DeserializeAsync( parts[0]).ConfigureAwait(false); + var result0 = await serializer.DeserializeAsync(parts[0]).ConfigureAwait(false); Assert.Equal(model1.Property1, result0.Property1); Assert.Equal(model1.Property2, result0.Property2); @@ -520,7 +520,7 @@ public async Task MultipartUploadShouldWorkWithMixedTypes() var anotherModel = new AnotherModel { - Foos = new []{"bar1", "bar2"} + Foos = new[] { "bar1", "bar2" } }; var handler = new MockHttpMessageHandler @@ -679,12 +679,14 @@ private static Stream GetTestFileStream(string relativeFilePath) var fullName = assembly .GetManifestResourceNames() .FirstOrDefault(name => name.EndsWith(relativeName, StringComparison.InvariantCulture)); - if (fullName == null) { + if (fullName == null) + { throw new Exception($"Unable to find resource for path \"{relativeFilePath}\". Resource with name ending on \"{relativeName}\" was not found in assembly."); } var stream = assembly.GetManifestResourceStream(fullName); - if (stream == null) { + if (stream == null) + { throw new Exception($"Unable to find resource for path \"{relativeFilePath}\". Resource named \"{fullName}\" was not found in assembly."); } @@ -702,7 +704,7 @@ bool StreamsEqual(Stream a, Stream b) throw new ArgumentNullException( a == null ? "a" : "b"); } - + if (a.Length < b.Length) return false; if (a.Length > b.Length) diff --git a/Refit.Tests/ResponseTests.cs b/Refit.Tests/ResponseTests.cs index 7a62aad06..89694707d 100644 --- a/Refit.Tests/ResponseTests.cs +++ b/Refit.Tests/ResponseTests.cs @@ -9,7 +9,8 @@ using Refit; // for the code gen using Xunit; -namespace Refit.Tests { +namespace Refit.Tests +{ public class TestAliasObject { [AliasAs("FIELD_WE_SHOULD_SHORTEN_WITH_ALIAS_AS")] @@ -88,7 +89,7 @@ public async Task ThrowsValidationException() expectedResponse.Content.Headers.ContentType = new System.Net.Http.Headers.MediaTypeHeaderValue("application/problem+json"); mockHandler.Expect(HttpMethod.Get, "http://api/aliasTest") .Respond(req => expectedResponse); - + var actualException = await Assert.ThrowsAsync(() => fixture.GetTestObject()); Assert.NotNull(actualException.Content); Assert.Equal("detail", actualException.Content.Detail); @@ -98,7 +99,7 @@ public async Task ThrowsValidationException() Assert.Equal(1, actualException.Content.Status); Assert.Equal("title", actualException.Content.Title); Assert.Equal("type", actualException.Content.Type); - + } } } diff --git a/Refit.Tests/RestService.cs b/Refit.Tests/RestService.cs index 9b8de8a8b..c09fbc3d9 100644 --- a/Refit.Tests/RestService.cs +++ b/Refit.Tests/RestService.cs @@ -100,7 +100,7 @@ public interface IHttpContentApi [Post("/blah")] Task> PostFileUploadWithMetadata([Body] HttpContent content); } - + public interface IStreamApi { [Post("/{filename}")] @@ -153,7 +153,7 @@ public async Task CanAddContentHeadersToPostWithoutBody() mockHttp.Expect(HttpMethod.Post, "http://foo/nobody") // The content length header is set automatically by the HttpContent instance, // so checking the header as a string doesn't work - .With(r => r.Content?.Headers.ContentLength == 0) + .With(r => r.Content?.Headers.ContentLength == 0) // But we added content type ourselves, so this should work .WithHeaders("Content-Type", "application/x-www-form-urlencoded; charset=UTF-8") .WithContent("") @@ -232,7 +232,7 @@ public async Task GetWithDecimal() var result = await fixture.GetWithDecimal(val); - mockHttp.VerifyNoOutstandingExpectation(); + mockHttp.VerifyNoOutstandingExpectation(); } @@ -288,7 +288,7 @@ public async Task HitTheNonExistentApiAsApiResponse() var fixture = RestService.For("https://api.github.com", settings); - using(var result = await fixture.NothingToSeeHereWithMetadata()) + using (var result = await fixture.NothingToSeeHereWithMetadata()) { Assert.False(result.IsSuccessStatusCode); Assert.NotNull(result.ReasonPhrase); @@ -350,7 +350,7 @@ public async Task HitTheGitHubUserApiAsObservableApiResponse() mockHttp.Expect(HttpMethod.Get, "https://api.github.com/users/octocat").Respond(req => responseMessage); var fixture = RestService.For("https://api.github.com", settings); - + var result = await fixture.GetUserObservableWithMetadata("octocat") .Timeout(TimeSpan.FromSeconds(10)); @@ -371,14 +371,15 @@ public async Task HitTheGitHubUserApi() { var mockHttp = new MockHttpMessageHandler(); - var settings = new RefitSettings { + var settings = new RefitSettings + { HttpMessageHandlerFactory = () => mockHttp, ContentSerializer = new JsonContentSerializer(new JsonSerializerSettings() { ContractResolver = new SnakeCasePropertyNamesContractResolver() }) }; mockHttp.Expect(HttpMethod.Get, "https://api.github.com/users/octocat") .Respond("application/json", "{ 'login':'octocat', 'avatar_url':'http://foo/bar' }"); - + var fixture = RestService.For("https://api.github.com", settings); @@ -395,7 +396,8 @@ public async Task HitWithCamelCaseParameter() { var mockHttp = new MockHttpMessageHandler(); - var settings = new RefitSettings { + var settings = new RefitSettings + { HttpMessageHandlerFactory = () => mockHttp, ContentSerializer = new JsonContentSerializer(new JsonSerializerSettings() { ContractResolver = new SnakeCasePropertyNamesContractResolver() }) }; @@ -418,7 +420,8 @@ public async Task HitTheGitHubOrgMembersApi() { var mockHttp = new MockHttpMessageHandler(); - var settings = new RefitSettings { + var settings = new RefitSettings + { HttpMessageHandlerFactory = () => mockHttp, ContentSerializer = new JsonContentSerializer(new JsonSerializerSettings() { ContractResolver = new SnakeCasePropertyNamesContractResolver() }) }; @@ -428,7 +431,7 @@ public async Task HitTheGitHubOrgMembersApi() var fixture = RestService.For("https://api.github.com", settings); - + var result = await fixture.GetOrgMembers("github"); Assert.True(result.Count > 0); @@ -442,7 +445,8 @@ public async Task HitTheGitHubUserSearchApi() { var mockHttp = new MockHttpMessageHandler(); - var settings = new RefitSettings { + var settings = new RefitSettings + { HttpMessageHandlerFactory = () => mockHttp, ContentSerializer = new JsonContentSerializer(new JsonSerializerSettings() { ContractResolver = new SnakeCasePropertyNamesContractResolver() }) }; @@ -465,7 +469,8 @@ public async Task HitTheGitHubUserApiAsObservable() { var mockHttp = new MockHttpMessageHandler(); - var settings = new RefitSettings { + var settings = new RefitSettings + { HttpMessageHandlerFactory = () => mockHttp, ContentSerializer = new JsonContentSerializer(new JsonSerializerSettings() { ContractResolver = new SnakeCasePropertyNamesContractResolver() }) }; @@ -490,7 +495,8 @@ public async Task HitTheGitHubUserApiAsObservableAndSubscribeAfterTheFact() { var mockHttp = new MockHttpMessageHandler(); - var settings = new RefitSettings { + var settings = new RefitSettings + { HttpMessageHandlerFactory = () => mockHttp, ContentSerializer = new JsonContentSerializer(new JsonSerializerSettings() { ContractResolver = new SnakeCasePropertyNamesContractResolver() }) }; @@ -510,7 +516,7 @@ public async Task HitTheGitHubUserApiAsObservableAndSubscribeAfterTheFact() Assert.Equal("octocat", result2.Login); Assert.False(string.IsNullOrEmpty(result2.AvatarUrl)); } - + [Fact] public async Task TwoSubscriptionsResultInTwoRequests() { @@ -545,7 +551,8 @@ public async Task ShouldRetHttpResponseMessage() { var mockHttp = new MockHttpMessageHandler(); - var settings = new RefitSettings { + var settings = new RefitSettings + { HttpMessageHandlerFactory = () => mockHttp, ContentSerializer = new JsonContentSerializer(new JsonSerializerSettings() { ContractResolver = new SnakeCasePropertyNamesContractResolver() }) }; @@ -560,13 +567,14 @@ public async Task ShouldRetHttpResponseMessage() Assert.NotNull(result); Assert.True(result.IsSuccessStatusCode); } - + [Fact] public async Task ShouldRetHttpResponseMessageWithNestedInterface() { var mockHttp = new MockHttpMessageHandler(); - var settings = new RefitSettings { + var settings = new RefitSettings + { HttpMessageHandlerFactory = () => mockHttp, ContentSerializer = new JsonContentSerializer(new JsonSerializerSettings() { ContractResolver = new SnakeCasePropertyNamesContractResolver() }) }; @@ -581,19 +589,20 @@ public async Task ShouldRetHttpResponseMessageWithNestedInterface() Assert.NotNull(result); Assert.True(result.IsSuccessStatusCode); } - + [Fact] public async Task HitTheNpmJs() { - var mockHttp = new MockHttpMessageHandler(); + var mockHttp = new MockHttpMessageHandler(); - var settings = new RefitSettings { + var settings = new RefitSettings + { HttpMessageHandlerFactory = () => mockHttp }; mockHttp.Expect(HttpMethod.Get, "https://registry.npmjs.org/congruence") .Respond("application/json", "{ '_id':'congruence', '_rev':'rev' , 'name':'name'}"); - + var fixture = RestService.For("https://registry.npmjs.org", settings); @@ -609,7 +618,8 @@ public async Task PostToRequestBin() { var mockHttp = new MockHttpMessageHandler(); - var settings = new RefitSettings { + var settings = new RefitSettings + { HttpMessageHandlerFactory = () => mockHttp }; @@ -617,8 +627,8 @@ public async Task PostToRequestBin() .Respond(HttpStatusCode.OK); var fixture = RestService.For("http://httpbin.org/", settings); - - + + await fixture.Post(); mockHttp.VerifyNoOutstandingExpectation(); @@ -687,7 +697,7 @@ public async Task PostStringUrlToRequestBin() var fixture = RestService.For("http://httpbin.org/", settings); - await fixture.PostRawStringUrlEncoded ("url&string"); + await fixture.PostRawStringUrlEncoded("url&string"); mockHttp.VerifyNoOutstandingExpectation(); } @@ -723,11 +733,12 @@ public async Task PostToRequestBinWithGenerics() } [Fact] - public async Task CanGetDataOutOfErrorResponses() + public async Task CanGetDataOutOfErrorResponses() { var mockHttp = new MockHttpMessageHandler(); - var settings = new RefitSettings { + var settings = new RefitSettings + { HttpMessageHandlerFactory = () => mockHttp, ContentSerializer = new JsonContentSerializer(new JsonSerializerSettings() { ContractResolver = new SnakeCasePropertyNamesContractResolver() }) }; @@ -736,10 +747,13 @@ public async Task CanGetDataOutOfErrorResponses() .Respond(HttpStatusCode.NotFound, "application/json", "{'message': 'Not Found', 'documentation_url': 'http://foo/bar'}"); var fixture = RestService.For("https://api.github.com", settings); - try { + try + { await fixture.NothingToSeeHere(); Assert.True(false); - } catch (ApiException exception) { + } + catch (ApiException exception) + { Assert.Equal(HttpStatusCode.NotFound, exception.StatusCode); var content = await exception.GetContentAsAsync>(); @@ -767,9 +781,9 @@ public async Task ErrorsFromApiReturnErrorContent() var fixture = RestService.For("https://api.github.com", settings); - var result = await Assert.ThrowsAsync(async () => await fixture.CreateUser(new User{Name = "foo"})); - - + var result = await Assert.ThrowsAsync(async () => await fixture.CreateUser(new User { Name = "foo" })); + + var errors = await result.GetContentAsAsync(); Assert.Contains("error1", errors.Errors); @@ -797,7 +811,7 @@ public async Task ErrorsFromApiReturnErrorContentWhenApiResponse() var fixture = RestService.For("https://api.github.com", settings); - using(var response = await fixture.CreateUserWithMetadata(new User { Name = "foo" })) + using (var response = await fixture.CreateUserWithMetadata(new User { Name = "foo" })) { Assert.False(response.IsSuccessStatusCode); Assert.NotNull(response.Error); @@ -809,7 +823,7 @@ public async Task ErrorsFromApiReturnErrorContentWhenApiResponse() mockHttp.VerifyNoOutstandingExpectation(); - } + } } [Fact] @@ -844,32 +858,39 @@ public async Task ErrorsFromApiReturnErrorContentNonAsync() } [Fact] - public void NonRefitInterfacesThrowMeaningfulExceptions() + public void NonRefitInterfacesThrowMeaningfulExceptions() { - try { + try + { RestService.For("http://example.com"); - } catch (InvalidOperationException exception) { + } + catch (InvalidOperationException exception) + { Assert.StartsWith("INoRefitHereBuddy", exception.Message); } } [Fact] - public async Task NonRefitMethodsThrowMeaningfulExceptions() + public async Task NonRefitMethodsThrowMeaningfulExceptions() { - try { + try + { var fixture = RestService.For("http://example.com"); await fixture.Get(); - } catch (NotImplementedException exception) { + } + catch (NotImplementedException exception) + { Assert.Contains("no Refit HTTP method attribute", exception.Message); } } [Fact] - public async Task GenericsWork() + public async Task GenericsWork() { var mockHttp = new MockHttpMessageHandler(); - var settings = new RefitSettings { + var settings = new RefitSettings + { HttpMessageHandlerFactory = () => mockHttp }; @@ -928,7 +949,7 @@ public async Task SimpleDynamicQueryparametersTest() .WithHeaders("X-Refit", "99") .Respond("application/json", "{'url': 'https://httpbin.org/get?FirstName=John&LastName=Rambo', 'args': {'FirstName': 'John', 'lName': 'Rambo'}}"); - var myParams = new MySimpleQueryParams + var myParams = new MySimpleQueryParams { FirstName = "John", LastName = "Rambo" @@ -1096,7 +1117,7 @@ public async Task ComplexDynamicQueryparametersTestWithIncludeParameterName() Assert.Equal("Rambo", resp.Args["search.LastName"]); Assert.Equal("9999", resp.Args["search.Addr.Zip"]); } - + [Fact] public async Task ServiceOutsideNamespaceGetRequest() { diff --git a/Refit.Tests/SerializedContentTests.cs b/Refit.Tests/SerializedContentTests.cs index d3c6a1223..a6bddf97a 100644 --- a/Refit.Tests/SerializedContentTests.cs +++ b/Refit.Tests/SerializedContentTests.cs @@ -18,7 +18,7 @@ public async Task WhenARequestRequiresABodyThenItDoesNotDeadlock(Type contentSer { if (!(Activator.CreateInstance(contentSerializerType) is IContentSerializer serializer)) { - throw new ArgumentException($"{contentSerializerType.FullName} does not implement {nameof(IContentSerializer)}"); + throw new ArgumentException($"{contentSerializerType.FullName} does not implement {nameof(IContentSerializer)}"); } var handler = new MockPushStreamContentHttpMessageHandler diff --git a/Refit.Tests/UniqueNameTests.cs b/Refit.Tests/UniqueNameTests.cs index 589442ab9..9656de4c3 100644 --- a/Refit.Tests/UniqueNameTests.cs +++ b/Refit.Tests/UniqueNameTests.cs @@ -25,7 +25,7 @@ public void SystemTypeAndLanguageTypeHaveSameNames() { var name1 = UniqueName.ForType(); var name2 = UniqueName.ForType(); - + Assert.Equal(name1, name2); } diff --git a/Refit.Tests/UseCultureAttribute.cs b/Refit.Tests/UseCultureAttribute.cs index 99de75203..5d3a4cb81 100644 --- a/Refit.Tests/UseCultureAttribute.cs +++ b/Refit.Tests/UseCultureAttribute.cs @@ -8,7 +8,7 @@ namespace Refit.Tests { - + /// /// Apply this attribute to your test method to replace the /// and diff --git a/Refit.Tests/XmlContentSerializerTests.cs b/Refit.Tests/XmlContentSerializerTests.cs index 6dd65cadc..2235b100d 100644 --- a/Refit.Tests/XmlContentSerializerTests.cs +++ b/Refit.Tests/XmlContentSerializerTests.cs @@ -35,7 +35,7 @@ public async Task ShouldSerializeToXml() { var dto = BuildDto(); var sut = new XmlContentSerializer(); - + var content = await sut.SerializeAsync(dto); var document = new XmlDocument(); document.LoadXml(await content.ReadAsStringAsync()); @@ -94,7 +94,8 @@ public async Task ShouldDeserializeFromXmlAsync() private static Dto BuildDto() { - var dto = new Dto { + var dto = new Dto + { CreatedOn = DateTime.UtcNow, Identifier = Guid.NewGuid().ToString(), Name = "Test Dto Object" diff --git a/Refit/ApiException.cs b/Refit/ApiException.cs index cfb759052..c5d67f44c 100644 --- a/Refit/ApiException.cs +++ b/Refit/ApiException.cs @@ -74,7 +74,7 @@ public static async Task Create(HttpRequestMessage message, HttpMe return exception; } - static string CreateMessage(HttpStatusCode statusCode, string reasonPhrase) => + static string CreateMessage(HttpStatusCode statusCode, string reasonPhrase) => $"Response status code does not indicate success: {(int)statusCode} ({reasonPhrase})."; } } diff --git a/Refit/ApiResponse.cs b/Refit/ApiResponse.cs index 5c7df954b..41c1c513d 100644 --- a/Refit/ApiResponse.cs +++ b/Refit/ApiResponse.cs @@ -41,7 +41,7 @@ public void Dispose() { Dispose(true); } - + public async Task> EnsureSuccessStatusCodeAsync() { if (!IsSuccessStatusCode) diff --git a/Refit/Attributes.cs b/Refit/Attributes.cs index 389308992..f7097ece6 100644 --- a/Refit/Attributes.cs +++ b/Refit/Attributes.cs @@ -8,8 +8,6 @@ namespace Refit { public abstract class HttpMethodAttribute : Attribute { - protected string path; - public HttpMethodAttribute(string path) { Path = path; @@ -19,8 +17,8 @@ public HttpMethodAttribute(string path) public virtual string Path { - get { return path; } - protected set { path = value; } + get; + protected set; } } diff --git a/Refit/FormValueMultimap.cs b/Refit/FormValueMultimap.cs index 66fd3ef8b..6fdb0a33a 100644 --- a/Refit/FormValueMultimap.cs +++ b/Refit/FormValueMultimap.cs @@ -15,7 +15,7 @@ namespace Refit /// same or different values. class FormValueMultimap : IEnumerable> { - static readonly Dictionary propertyCache + static readonly Dictionary PropertyCache = new Dictionary(); private readonly IList> formEntries = new List>(); @@ -29,7 +29,8 @@ public FormValueMultimap(object source, RefitSettings settings) foreach (var key in dictionary.Keys) { var value = dictionary[key]; - if (value != null) { + if (value != null) + { Add(key.ToString(), settings.FormUrlEncodedParameterFormatter.Format(value, null)); } } @@ -39,14 +40,14 @@ public FormValueMultimap(object source, RefitSettings settings) var type = source.GetType(); - lock (propertyCache) + lock (PropertyCache) { - if (!propertyCache.ContainsKey(type)) + if (!PropertyCache.ContainsKey(type)) { - propertyCache[type] = GetProperties(type); + PropertyCache[type] = GetProperties(type); } - foreach (var property in propertyCache[type]) + foreach (var property in PropertyCache[type]) { var value = property.GetValue(source, null); if (value != null) @@ -70,7 +71,7 @@ public FormValueMultimap(object source, RefitSettings settings) case CollectionFormat.Ssv: case CollectionFormat.Tsv: case CollectionFormat.Pipes: - var delimiter = attrib.CollectionFormat == CollectionFormat.Csv ? "," + var delimiter = attrib.CollectionFormat == CollectionFormat.Csv ? "," : attrib.CollectionFormat == CollectionFormat.Ssv ? " " : attrib.CollectionFormat == CollectionFormat.Tsv ? "\t" : "|"; diff --git a/Refit/JsonContentSerializer.cs b/Refit/JsonContentSerializer.cs index 7240a085b..45c87fe49 100644 --- a/Refit/JsonContentSerializer.cs +++ b/Refit/JsonContentSerializer.cs @@ -19,7 +19,7 @@ public JsonContentSerializer(JsonSerializerSettings jsonSerializerSettings) { if (jsonSerializerSettings == null) { - if(JsonConvert.DefaultSettings == null) + if (JsonConvert.DefaultSettings == null) { return new JsonSerializerSettings(); } diff --git a/Refit/NameValueCollection.cs b/Refit/NameValueCollection.cs index b0ebb9e42..4cbd28c9d 100644 --- a/Refit/NameValueCollection.cs +++ b/Refit/NameValueCollection.cs @@ -9,6 +9,6 @@ namespace System.Collections.Specialized class NameValueCollection : Dictionary { public string[] AllKeys => Keys.ToArray(); - + } } diff --git a/Refit/PushStreamContent.cs b/Refit/PushStreamContent.cs index 3f4e76547..1d51ebcb8 100644 --- a/Refit/PushStreamContent.cs +++ b/Refit/PushStreamContent.cs @@ -166,8 +166,8 @@ public CompleteTaskOnCloseStream(Stream innerStream, TaskCompletionSource } [SuppressMessage( - "Microsoft.Usage", - "CA2215:Dispose methods should call base class dispose", + "Microsoft.Usage", + "CA2215:Dispose methods should call base class dispose", Justification = "See comments, this is intentional.")] protected override void Dispose(bool disposing) { diff --git a/Refit/RefitSettings.cs b/Refit/RefitSettings.cs index 4ca6ac81d..20226adf0 100644 --- a/Refit/RefitSettings.cs +++ b/Refit/RefitSettings.cs @@ -60,7 +60,7 @@ public interface IFormUrlEncodedParameterFormatter public class DefaultUrlParameterFormatter : IUrlParameterFormatter { - static readonly ConcurrentDictionary> enumMemberCache + static readonly ConcurrentDictionary> EnumMemberCache = new ConcurrentDictionary>(); public virtual string Format(object parameterValue, ParameterInfo parameterInfo) @@ -71,7 +71,7 @@ public virtual string Format(object parameterValue, ParameterInfo parameterInfo) EnumMemberAttribute enummember = null; if (parameterValue != null && parameterInfo.ParameterType.GetTypeInfo().IsEnum) { - var cached = enumMemberCache.GetOrAdd(parameterInfo.ParameterType, t => new ConcurrentDictionary()); + var cached = EnumMemberCache.GetOrAdd(parameterInfo.ParameterType, t => new ConcurrentDictionary()); enummember = cached.GetOrAdd(parameterValue.ToString(), val => parameterInfo.ParameterType.GetMember(val).First().GetCustomAttribute()); } @@ -87,7 +87,7 @@ public virtual string Format(object parameterValue, ParameterInfo parameterInfo) public class DefaultFormUrlEncodedParameterFormatter : IFormUrlEncodedParameterFormatter { - static readonly ConcurrentDictionary> enumMemberCache + static readonly ConcurrentDictionary> EnumMemberCache = new ConcurrentDictionary>(); public virtual string Format(object parameterValue, string formatString) @@ -100,7 +100,7 @@ public virtual string Format(object parameterValue, string formatString) EnumMemberAttribute enummember = null; if (parameterType.GetTypeInfo().IsEnum) { - var cached = enumMemberCache.GetOrAdd(parameterType, t => new ConcurrentDictionary()); + var cached = EnumMemberCache.GetOrAdd(parameterType, t => new ConcurrentDictionary()); enummember = cached.GetOrAdd(parameterValue.ToString(), val => parameterType.GetMember(val).First().GetCustomAttribute()); } diff --git a/Refit/RequestBuilder.cs b/Refit/RequestBuilder.cs index 160a796f6..af4ec68b2 100644 --- a/Refit/RequestBuilder.cs +++ b/Refit/RequestBuilder.cs @@ -17,16 +17,16 @@ public interface IRequestBuilder : IRequestBuilder public static class RequestBuilder { - static readonly IRequestBuilderFactory platformRequestBuilderFactory = new RequestBuilderFactory(); + static readonly IRequestBuilderFactory PlatformRequestBuilderFactory = new RequestBuilderFactory(); public static IRequestBuilder ForType(RefitSettings settings) { - return platformRequestBuilderFactory.Create(settings); + return PlatformRequestBuilderFactory.Create(settings); } public static IRequestBuilder ForType() { - return platformRequestBuilderFactory.Create(null); + return PlatformRequestBuilderFactory.Create(null); } } } diff --git a/Refit/RequestBuilderImplementation.TaskToObservable.cs b/Refit/RequestBuilderImplementation.TaskToObservable.cs index 5109b16f4..071d3afd8 100644 --- a/Refit/RequestBuilderImplementation.TaskToObservable.cs +++ b/Refit/RequestBuilderImplementation.TaskToObservable.cs @@ -23,10 +23,10 @@ public IDisposable Subscribe(IObserver observer) #pragma warning disable VSTHRD110 // Observe result of async calls taskFactory(cts.Token).ContinueWith(t => { - if (cts.IsCancellationRequested) return; + if (cts.IsCancellationRequested) return; - ToObservableDone(t, observer); - }, + ToObservableDone(t, observer); + }, TaskScheduler.Default); #pragma warning restore VSTHRD110 // Observe result of async calls @@ -38,20 +38,20 @@ static void ToObservableDone(Task task, IObserver sub { switch (task.Status) { - case TaskStatus.RanToCompletion: + case TaskStatus.RanToCompletion: #pragma warning disable VSTHRD002 // Avoid problematic synchronous waits #pragma warning disable VSTHRD102 // Implement internal logic asynchronously - subject.OnNext(task.Result); + subject.OnNext(task.Result); #pragma warning restore VSTHRD102 // Implement internal logic asynchronously #pragma warning restore VSTHRD002 // Avoid problematic synchronous waits - subject.OnCompleted(); - break; - case TaskStatus.Faulted: - subject.OnError(task.Exception.InnerException); - break; - case TaskStatus.Canceled: - subject.OnError(new TaskCanceledException(task)); - break; + subject.OnCompleted(); + break; + case TaskStatus.Faulted: + subject.OnError(task.Exception.InnerException); + break; + case TaskStatus.Canceled: + subject.OnError(new TaskCanceledException(task)); + break; } } } diff --git a/Refit/RequestBuilderImplementation.cs b/Refit/RequestBuilderImplementation.cs index 89b499059..1e96d9650 100644 --- a/Refit/RequestBuilderImplementation.cs +++ b/Refit/RequestBuilderImplementation.cs @@ -17,7 +17,7 @@ namespace Refit { partial class RequestBuilderImplementation : IRequestBuilder { - static readonly ISet bodylessMethods = new HashSet + static readonly ISet BodylessMethods = new HashSet { HttpMethod.Get, HttpMethod.Head @@ -44,13 +44,13 @@ public RequestBuilderImplementation(RefitSettings refitSettings = null) TargetType = targetInterface; var dict = new Dictionary>(); - foreach (var methodInfo in targetInterface.GetMethods()) + foreach (var methodInfo in targetInterface.GetMethods()) { var attrs = methodInfo.GetCustomAttributes(true); var hasHttpMethod = attrs.OfType().Any(); - if (hasHttpMethod) + if (hasHttpMethod) { - if (!dict.ContainsKey(methodInfo.Name)) + if (!dict.ContainsKey(methodInfo.Name)) { dict.Add(methodInfo.Name, new List()); } @@ -64,11 +64,11 @@ public RequestBuilderImplementation(RefitSettings refitSettings = null) RestMethodInfo FindMatchingRestMethodInfo(string key, Type[] parameterTypes, Type[] genericArgumentTypes) { - if (interfaceHttpMethods.TryGetValue(key, out var httpMethods)) + if (interfaceHttpMethods.TryGetValue(key, out var httpMethods)) { - if (parameterTypes == null) + if (parameterTypes == null) { - if (httpMethods.Count > 1) + if (httpMethods.Count > 1) { throw new ArgumentException($"MethodName exists more than once, '{nameof(parameterTypes)}' mut be defined"); } @@ -91,7 +91,7 @@ RestMethodInfo FindMatchingRestMethodInfo(string key, Type[] parameterTypes, Typ return CloseGenericMethodIfNeeded(possibleMethods[0], genericArgumentTypes); var parameterTypesArray = parameterTypes.ToArray(); - foreach (var method in possibleMethods) + foreach (var method in possibleMethods) { var match = method.MethodInfo.GetParameters() .Select(p => p.ParameterType) @@ -104,7 +104,7 @@ RestMethodInfo FindMatchingRestMethodInfo(string key, Type[] parameterTypes, Typ throw new Exception("No suitable Method found..."); } - else + else { throw new ArgumentException("Method must be defined and have an HTTP Method attribute"); } @@ -165,7 +165,7 @@ async Task AddMultipartItemAsync(MultipartFormDataContent multiPartContent, stri multiPartContent.Add(content); return; } - if (itemValue is MultipartItem multipartItem) + if (itemValue is MultipartItem multipartItem) { var httpContent = multipartItem.ToContent(); multiPartContent.Add(httpContent, parameterName, string.IsNullOrEmpty(multipartItem.FileName) ? fileName : multipartItem.FileName); @@ -179,7 +179,7 @@ async Task AddMultipartItemAsync(MultipartFormDataContent multiPartContent, stri return; } - if (itemValue is string stringValue) + if (itemValue is string stringValue) { multiPartContent.Add(new StringContent(stringValue), parameterName); return; @@ -192,7 +192,8 @@ async Task AddMultipartItemAsync(MultipartFormDataContent multiPartContent, stri return; } - if (itemValue is byte[] byteArrayValue) { + if (itemValue is byte[] byteArrayValue) + { var fileContent = new ByteArrayContent(byteArrayValue); multiPartContent.Add(fileContent, parameterName, fileName); return; @@ -205,7 +206,7 @@ async Task AddMultipartItemAsync(MultipartFormDataContent multiPartContent, stri multiPartContent.Add(await settings.ContentSerializer.SerializeAsync(itemValue).ConfigureAwait(false), parameterName); return; } - catch(Exception ex) + catch (Exception ex) { // Eat this since we're about to throw as a fallback anyway e = ex; @@ -401,7 +402,7 @@ List> BuildQueryMap(IDictionary dictionary, string Func> BuildRequestFactoryForMethod(RestMethodInfo restMethod, string basePath, bool paramsContainsCancellationToken) { - + return async paramList => { // make sure we strip out any cancelation tokens @@ -463,7 +464,7 @@ Func> BuildRequestFactoryForMethod(RestMethod switch (restMethod.BodyParameterInfo.Item1) { case BodySerializationMethod.UrlEncoded: - ret.Content = paramList[i] is string str ? (HttpContent)new StringContent(Uri.EscapeDataString(str), Encoding.UTF8, "application/x-www-form-urlencoded") : new FormUrlEncodedContent(new FormValueMultimap(paramList[i], settings)); + ret.Content = paramList[i] is string str ? (HttpContent)new StringContent(Uri.EscapeDataString(str), Encoding.UTF8, "application/x-www-form-urlencoded") : new FormUrlEncodedContent(new FormValueMultimap(paramList[i], settings)); break; case BodySerializationMethod.Default: #pragma warning disable CS0618 // Type or member is obsolete @@ -475,7 +476,8 @@ Func> BuildRequestFactoryForMethod(RestMethod { case false: ret.Content = new PushStreamContent( - async (stream, _, __) => { + async (stream, _, __) => + { using (stream) { await content.CopyToAsync(stream).ConfigureAwait(false); @@ -527,7 +529,7 @@ Func> BuildRequestFactoryForMethod(RestMethod case CollectionFormat.Ssv: case CollectionFormat.Tsv: case CollectionFormat.Pipes: - var delimiter = attr.CollectionFormat == CollectionFormat.Csv ? "," + var delimiter = attr.CollectionFormat == CollectionFormat.Csv ? "," : attr.CollectionFormat == CollectionFormat.Ssv ? " " : attr.CollectionFormat == CollectionFormat.Tsv ? "\t" : "|"; @@ -596,7 +598,7 @@ Func> BuildRequestFactoryForMethod(RestMethod // We could have content headers, so we need to make // sure we have an HttpContent object to add them to, // provided the HttpClient will allow it for the method - if (ret.Content == null && !bodylessMethods.Contains(ret.Method)) + if (ret.Content == null && !BodylessMethods.Contains(ret.Method)) ret.Content = new ByteArrayContent(new byte[0]); foreach (var header in headersToAdd) diff --git a/Refit/RestMethodInfo.cs b/Refit/RestMethodInfo.cs index 1ce9997f8..16903b2a9 100644 --- a/Refit/RestMethodInfo.cs +++ b/Refit/RestMethodInfo.cs @@ -33,8 +33,8 @@ public class RestMethodInfo public Type SerializedGenericArgument { get; set; } public bool IsApiResponse { get; } - static readonly Regex parameterRegex = new Regex(@"{(.*?)}"); - static readonly HttpMethod patchMethod = new HttpMethod("PATCH"); + static readonly Regex ParameterRegex = new Regex(@"{(.*?)}"); + static readonly HttpMethod PatchMethod = new HttpMethod("PATCH"); public RestMethodInfo(Type targetInterface, MethodInfo methodInfo, RefitSettings refitSettings = null) { @@ -70,9 +70,12 @@ public RestMethodInfo(Type targetInterface, MethodInfo methodInfo, RefitSettings // get names for multipart attachments AttachmentNameMap = new Dictionary>(); - if (IsMultipart) { - for (var i = 0; i < parameterList.Count; i++) { - if (ParameterMap.ContainsKey(i) || HeaderParameterMap.ContainsKey(i)) { + if (IsMultipart) + { + for (var i = 0; i < parameterList.Count; i++) + { + if (ParameterMap.ContainsKey(i) || HeaderParameterMap.ContainsKey(i)) + { continue; } @@ -85,8 +88,10 @@ public RestMethodInfo(Type targetInterface, MethodInfo methodInfo, RefitSettings } QueryParameterMap = new Dictionary(); - for (var i=0; i < parameterList.Count; i++) { - if (ParameterMap.ContainsKey(i) || HeaderParameterMap.ContainsKey(i) || (BodyParameterInfo != null && BodyParameterInfo.Item3 == i)) { + for (var i = 0; i < parameterList.Count; i++) + { + if (ParameterMap.ContainsKey(i) || HeaderParameterMap.ContainsKey(i) || (BodyParameterInfo != null && BodyParameterInfo.Item3 == i)) + { continue; } @@ -94,7 +99,8 @@ public RestMethodInfo(Type targetInterface, MethodInfo methodInfo, RefitSettings } var ctParams = methodInfo.GetParameters().Where(p => p.ParameterType == typeof(CancellationToken)).ToList(); - if(ctParams.Count > 1) { + if (ctParams.Count > 1) + { throw new ArgumentException($"Argument list to method \"{methodInfo.Name}\" can only contain a single CancellationToken"); } @@ -104,23 +110,25 @@ public RestMethodInfo(Type targetInterface, MethodInfo methodInfo, RefitSettings SerializedReturnType.GetGenericTypeDefinition() == typeof(ApiResponse<>); } - void VerifyUrlPathIsSane(string relativePath) + void VerifyUrlPathIsSane(string relativePath) { if (relativePath == "") return; - if (!relativePath.StartsWith("/")) { + if (!relativePath.StartsWith("/")) + { goto bogusPath; } var parts = relativePath.Split('/'); - if (parts.Length == 0) { + if (parts.Length == 0) + { goto bogusPath; } return; - bogusPath: +bogusPath: throw new ArgumentException($"URL path {relativePath} must be of the form '/foo/bar/baz'"); } @@ -129,18 +137,21 @@ Dictionary BuildParameterMap(string relativePath, List(); var parameterizedParts = relativePath.Split('/', '?') - .SelectMany(x => parameterRegex.Matches(x).Cast()) + .SelectMany(x => ParameterRegex.Matches(x).Cast()) .ToList(); - if (parameterizedParts.Count == 0) { + if (parameterizedParts.Count == 0) + { return ret; } var paramValidationDict = parameterInfo.ToDictionary(k => GetUrlNameForParameter(k).ToLowerInvariant(), v => v); - foreach (var match in parameterizedParts) { + foreach (var match in parameterizedParts) + { var name = match.Groups[1].Value.ToLowerInvariant(); - if (!paramValidationDict.ContainsKey(name)) { + if (!paramValidationDict.ContainsKey(name)) + { throw new ArgumentException($"URL {relativePath} has parameter {name}, but no method parameter matches"); } @@ -182,26 +193,31 @@ Tuple FindBodyParameter(IList .ToList(); // multipart requests may not contain a body, implicit or explicit - if (isMultipart) { - if (bodyParams.Count > 0) { + if (isMultipart) + { + if (bodyParams.Count > 0) + { throw new ArgumentException("Multipart requests may not contain a Body parameter"); } return null; } - if (bodyParams.Count > 1) { + if (bodyParams.Count > 1) + { throw new ArgumentException("Only one parameter can be a Body parameter"); } // #1, body attribute wins - if (bodyParams.Count == 1) { + if (bodyParams.Count == 1) + { var ret = bodyParams[0]; - return Tuple.Create(ret.BodyAttribute.SerializationMethod, ret.BodyAttribute.Buffered ?? RefitSettings.Buffered, + return Tuple.Create(ret.BodyAttribute.SerializationMethod, ret.BodyAttribute.Buffered ?? RefitSettings.Buffered, parameterList.IndexOf(ret.Parameter)); } // Not in post/put/patch? bail - if (!method.Equals(HttpMethod.Post) && !method.Equals(HttpMethod.Put) && !method.Equals(patchMethod)) { + if (!method.Equals(HttpMethod.Post) && !method.Equals(HttpMethod.Put) && !method.Equals(PatchMethod)) + { return null; } @@ -209,18 +225,20 @@ Tuple FindBodyParameter(IList var refParams = parameterList.Where(pi => !pi.ParameterType.GetTypeInfo().IsValueType && pi.ParameterType != typeof(string)).ToList(); // Check for rule #3 - if (refParams.Count > 1) { + if (refParams.Count > 1) + { throw new ArgumentException("Multiple complex types found. Specify one parameter as the body using BodyAttribute"); } - if (refParams.Count == 1) { + if (refParams.Count == 1) + { return Tuple.Create(BodySerializationMethod.Serialized, false, parameterList.IndexOf(refParams[0])); } return null; } - Dictionary ParseHeaders(MethodInfo methodInfo) + Dictionary ParseHeaders(MethodInfo methodInfo) { var ret = new Dictionary(); @@ -235,13 +253,14 @@ Dictionary ParseHeaders(MethodInfo methodInfo) .OfType() .SelectMany(ha => ha.Headers); - foreach (var header in headers) { + foreach (var header in headers) + { if (string.IsNullOrWhiteSpace(header)) continue; - // NB: Silverlight doesn't have an overload for String.Split() - // with a count parameter, but header values can contain - // ':' so we have to re-join all but the first part to get the - // value. + // NB: Silverlight doesn't have an overload for String.Split() + // with a count parameter, but header values can contain + // ':' so we have to re-join all but the first part to get the + // value. var parts = header.Split(':'); ret[parts[0].Trim()] = parts.Length > 1 ? string.Join(":", parts.Skip(1)).Trim() : null; @@ -250,17 +269,19 @@ Dictionary ParseHeaders(MethodInfo methodInfo) return ret; } - Dictionary BuildHeaderParameterMap(List parameterList) + Dictionary BuildHeaderParameterMap(List parameterList) { var ret = new Dictionary(); - for (var i = 0; i < parameterList.Count; i++) { + for (var i = 0; i < parameterList.Count; i++) + { var header = parameterList[i].GetCustomAttributes(true) .OfType() .Select(ha => ha.Header) .FirstOrDefault(); - if (!string.IsNullOrWhiteSpace(header)) { + if (!string.IsNullOrWhiteSpace(header)) + { ret[i] = header.Trim(); } } @@ -270,8 +291,10 @@ Dictionary BuildHeaderParameterMap(List parameterLis void DetermineReturnTypeInfo(MethodInfo methodInfo) { - if (methodInfo.ReturnType.GetTypeInfo().IsGenericType == false) { - if (methodInfo.ReturnType != typeof (Task)) { + if (methodInfo.ReturnType.GetTypeInfo().IsGenericType == false) + { + if (methodInfo.ReturnType != typeof(Task)) + { goto bogusMethod; } @@ -281,7 +304,8 @@ void DetermineReturnTypeInfo(MethodInfo methodInfo) } var genericType = methodInfo.ReturnType.GetGenericTypeDefinition(); - if (genericType != typeof(Task<>) && genericType != typeof(IObservable<>)) { + if (genericType != typeof(Task<>) && genericType != typeof(IObservable<>)) + { goto bogusMethod; } @@ -293,8 +317,8 @@ void DetermineReturnTypeInfo(MethodInfo methodInfo) return; - bogusMethod: +bogusMethod: throw new ArgumentException($"Method \"{methodInfo.Name}\" is invalid. All REST Methods must return either Task or IObservable"); - } + } } } diff --git a/Refit/RestService.cs b/Refit/RestService.cs index c3bf56812..82f86af2d 100644 --- a/Refit/RestService.cs +++ b/Refit/RestService.cs @@ -1,4 +1,4 @@ -using System; +using System; using System.Collections.Concurrent; using System.Collections.Generic; using System.Linq; @@ -14,22 +14,22 @@ interface IRestService public static class RestService { - static readonly ConcurrentDictionary typeMapping = new ConcurrentDictionary(); + static readonly ConcurrentDictionary TypeMapping = new ConcurrentDictionary(); public static T For(HttpClient client, IRequestBuilder builder) { - var generatedType = typeMapping.GetOrAdd(typeof(T), GetGeneratedType()); + var generatedType = TypeMapping.GetOrAdd(typeof(T), GetGeneratedType()); return (T)Activator.CreateInstance(generatedType, client, builder); } - + public static T For(HttpClient client, RefitSettings settings) { IRequestBuilder requestBuilder = RequestBuilder.ForType(settings); return For(client, requestBuilder); } - + public static T For(HttpClient client) => For(client, (RefitSettings)null); public static T For(string hostUrl, RefitSettings settings) diff --git a/Refit/UniqueName.cs b/Refit/UniqueName.cs index 69976a8ba..33e6d0082 100644 --- a/Refit/UniqueName.cs +++ b/Refit/UniqueName.cs @@ -14,12 +14,12 @@ public static string ForType() else { var className = "AutoGenerated" + typeof(T).Name; - + if (typeof(T).Namespace == null) { className = $"{className}.{className}"; } - + typeName = typeof(T).AssemblyQualifiedName.Replace(typeof(T).Name, className); } diff --git a/Refit/XmlContentSerializer.cs b/Refit/XmlContentSerializer.cs index c82350900..dfdc771c8 100644 --- a/Refit/XmlContentSerializer.cs +++ b/Refit/XmlContentSerializer.cs @@ -6,7 +6,8 @@ using System.Xml; using System.Xml.Serialization; -namespace Refit { +namespace Refit +{ public class XmlContentSerializer : IContentSerializer { @@ -25,15 +26,15 @@ public Task SerializeAsync(T item) { var xmlSerializer = new XmlSerializer(item.GetType(), settings.XmlAttributeOverrides); - using(var output = new StringWriter()) + using (var output = new StringWriter()) { - using(var writer = XmlWriter.Create(output, settings.XmlReaderWriterSettings.WriterSettings)) + using (var writer = XmlWriter.Create(output, settings.XmlReaderWriterSettings.WriterSettings)) { xmlSerializer.Serialize(writer, item, settings.XmlNamespaces); var content = new StringContent(output.ToString(), Encoding.UTF8, "application/xml"); return Task.FromResult((HttpContent)content); } - } + } } public async Task DeserializeAsync(HttpContent content) diff --git a/Refit/targets/refit.targets b/Refit/targets/refit.targets index 0652ca11c..ed5dfd097 100644 --- a/Refit/targets/refit.targets +++ b/Refit/targets/refit.targets @@ -6,7 +6,7 @@ GenerateRefitStubs; - + $(MSBuildProjectDirectory)obj\$(Configuration)\ $(MSBuildThisFileDirectory)..\MSBuildCore20\InterfaceStubGenerator.BuildTasks.dll @@ -16,22 +16,22 @@ $(BundledNETCoreAppTargetFrameworkVersion) 1.0 - + $(RootNamespace) - + - + - + - + - - + + From 20f4cf1012a3059ac71147e9ee958901857e259e Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Sat, 16 Feb 2019 17:17:00 -0500 Subject: [PATCH 10/11] Build with .NET Core SDK 3 --- azure-pipelines.yml | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/azure-pipelines.yml b/azure-pipelines.yml index 3f883ab61..c46de1a1c 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -32,7 +32,11 @@ steps: - script: nbgv cloud displayName: Set Version - + +- task: DotNetCoreInstaller@0 + inputs: + version: '3.0.100-preview-010184' + - task: DotNetCoreCLI@2 inputs: command: build From a5006e1bed9e1347299e2cd3b2fb0a29876c1034 Mon Sep 17 00:00:00 2001 From: Oren Novotny Date: Sat, 16 Feb 2019 17:21:27 -0500 Subject: [PATCH 11/11] Update to latest mock and test libs --- Refit.Tests/Refit.Tests.csproj | 4 ++-- azure-pipelines.yml | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Refit.Tests/Refit.Tests.csproj b/Refit.Tests/Refit.Tests.csproj index 63949f40a..45936ca9c 100644 --- a/Refit.Tests/Refit.Tests.csproj +++ b/Refit.Tests/Refit.Tests.csproj @@ -10,11 +10,11 @@ - + - + diff --git a/azure-pipelines.yml b/azure-pipelines.yml index c46de1a1c..17c84b969 100644 --- a/azure-pipelines.yml +++ b/azure-pipelines.yml @@ -67,7 +67,7 @@ steps: inputs: command: test projects: Refit.Tests/Refit.Tests.csproj - arguments: -c $(BuildConfiguration) --collect:"Code Coverage" -s $(System.DefaultWorkingDirectory)/CodeCoverage.runsettings /p:DebugType=portable + arguments: -c $(BuildConfiguration) --collect:"Code Coverage" -s $(System.DefaultWorkingDirectory)/CodeCoverage.runsettings displayName: Run Tests - task: PowerShell@2