From 5a1efa90c7d975fc6c2cc1e1df54a57f3f7681f1 Mon Sep 17 00:00:00 2001 From: MattMo Date: Mon, 6 Feb 2023 11:38:36 -0800 Subject: [PATCH] Reverting. Actually this is better. --- Rest.Net/RestCSharpClientGenerator.cs | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/Rest.Net/RestCSharpClientGenerator.cs b/Rest.Net/RestCSharpClientGenerator.cs index 068cd16..943a034 100644 --- a/Rest.Net/RestCSharpClientGenerator.cs +++ b/Rest.Net/RestCSharpClientGenerator.cs @@ -72,13 +72,13 @@ namespace MontoyaTech.Rest.Net writer.WriteBreak().WriteLine("public static void Init(string baseUrl)").WriteLine("{").Indent(); //Init the base url - writer.WriteLine("BaseUrl = baseUrl;"); + writer.WriteLine($"{this.ClientName}.BaseUrl = baseUrl;"); //Init the http client - writer.WriteLine("HttpClient = new HttpClient();"); - writer.WriteLine(@"HttpClient.DefaultRequestHeaders.Add(""Accept"", ""*/*"");"); - writer.WriteLine(@"HttpClient.DefaultRequestHeaders.Add(""Connection"", ""keep-alive"");"); - writer.WriteLine(@"HttpClient.DefaultRequestHeaders.Add(""Accept-Encoding"", ""identity"");"); + writer.WriteLine($"{this.ClientName}.HttpClient = new HttpClient();"); + writer.WriteLine(@$"{this.ClientName}.HttpClient.DefaultRequestHeaders.Add(""Accept"", ""*/*"");"); + writer.WriteLine(@$"{this.ClientName}.HttpClient.DefaultRequestHeaders.Add(""Connection"", ""keep-alive"");"); + writer.WriteLine(@$"{this.ClientName}.HttpClient.DefaultRequestHeaders.Add(""Accept-Encoding"", ""identity"");"); writer.Outdent().WriteLine("}"); } @@ -301,7 +301,7 @@ namespace MontoyaTech.Rest.Net } if (this.StaticCode) - writer.WriteSeparator().Write('$').Write('"').Write("{BaseUrl}"); + writer.WriteSeparator().Write('$').Write('"').Write("{Client.BaseUrl}"); else writer.WriteSeparator().Write('$').Write('"').Write("{this.Client.BaseUrl}"); @@ -346,7 +346,7 @@ namespace MontoyaTech.Rest.Net //Generate the response code if (this.StaticCode) - writer.WriteBreak().WriteLine("var response = HttpClient.Send(message);"); + writer.WriteBreak().WriteLine("var response = Client.HttpClient.Send(message);"); else writer.WriteBreak().WriteLine("var response = this.Client.HttpClient.Send(message);");