Improved C# client template, closes RicoSuter#381

RicoSuter · RicoSuter · commit 480c90663fa0 · 2016-11-08T16:39:57.000+01:00
diff --git a/src/NSwag.CodeGeneration.Tests/ClientGeneration/CSharpClientSettingsTests.cs b/src/NSwag.CodeGeneration.Tests/ClientGeneration/CSharpClientSettingsTests.cs
@@ -33,7 +33,7 @@ public void When_ConfigurationClass_is_set_then_correct_ctor_is_generated()
             var code = generator.GenerateFile();
 
             //// Assert
-            Assert.IsTrue(code.Contains("public FooClient(string baseUrl, MyConfig configuration) : base(configuration)"));
+            Assert.IsTrue(code.Contains("public FooClient(MyConfig configuration) : base(configuration)"));
         }
 
         [TestMethod]
diff --git a/src/NSwag.CodeGeneration/CodeGenerators/CSharp/Templates/ClientTemplate.cs b/src/NSwag.CodeGeneration/CodeGenerators/CSharp/Templates/ClientTemplate.cs
diff --git a/src/NSwag.CodeGeneration/CodeGenerators/CSharp/Templates/ClientTemplate.tt b/src/NSwag.CodeGeneration/CodeGenerators/CSharp/Templates/ClientTemplate.tt
@@ -35,30 +35,30 @@ public partial interface I<#=Model.Class#>
 public partial class <#=Model.Class#> <#if(Model.HasBaseType){#>: <#}#><#if(Model.HasBaseClass){#><#=Model.BaseClass#><#if(Model.GenerateClientInterfaces){#>, <#}#><#}#><#if(Model.GenerateClientInterfaces){#>I<#=Model.Class#><#}#>
 
 {
+    private string _baseUrl = "<#=Model.BaseUrl#>";
+    
 <#if(Model.HasConfigurationClass){#>
-    public <#=Model.Class#>() : this("<#=Model.BaseUrl#>", null) { }
-
-    public <#=Model.Class#>(string baseUrl) : this(baseUrl, null) { }
-
-    public <#=Model.Class#>(string baseUrl, <#=Model.ConfigurationClass#> configuration) : base(configuration)
+    public <#=Model.Class#>(<#=Model.ConfigurationClass#> configuration) : base(configuration)
     {
-        BaseUrl = baseUrl; 
     }
-<#}else{#>
-    public <#=Model.Class#>() : this("<#=Model.BaseUrl#>") { }
 
+<#}else if(string.IsNullOrEmpty(Model.BaseUrl)){#>
     public <#=Model.Class#>(string baseUrl)
     {
         BaseUrl = baseUrl; 
     }
+
 <#}#>
+    public string BaseUrl 
+    {
+        get { return _baseUrl; }
+        set { _baseUrl = value; }
+    }
 
     partial void PrepareRequest(HttpClient request, ref string url);
 
     partial void ProcessResponse(HttpClient request, HttpResponseMessage response);
 
-    public string BaseUrl { get; set; }
-
 <#foreach(var operation in Model.Operations){#>
 <#  if(operation.HasSummary){#>    /// <summary><#=ConversionUtilities.ConvertCSharpDocBreaks(operation.Summary, 1)#></summary>
 <#  }foreach (var parameter in operation.Parameters){#>
diff --git a/src/NSwag.Integration.ClientPCL.Tests/GeoControllerTests.cs b/src/NSwag.Integration.ClientPCL.Tests/GeoControllerTests.cs
@@ -14,7 +14,7 @@ public class GeoControllerTests
         public async Task SaveItems()
         {
             //// Arrange
-            var geoClient = new GeoClient("http://localhost:13452");
+            var geoClient = new GeoClient { BaseUrl = "http://localhost:13452" };
 
             //// Act
             try
@@ -36,7 +36,7 @@ public async Task SaveItems()
         public async Task UploadFile()
         {
             //// Arrange
-            var geoClient = new GeoClient("http://localhost:13452");
+            var geoClient = new GeoClient { BaseUrl = "http://localhost:13452" };
 
             //// Act
             var result = await geoClient.UploadFileAsync(new FileParameter(new MemoryStream(new byte[] { 1, 2 })));
diff --git a/src/NSwag.Integration.ClientPCL.Tests/PersonsControllerTests.cs b/src/NSwag.Integration.ClientPCL.Tests/PersonsControllerTests.cs
@@ -13,7 +13,7 @@ public class PersonsControllerTests
         public async Task GetAll_SerializationTest()
         {
             //// Arrange
-            var personsClient = new PersonsClient("http://localhost:13452");
+            var personsClient = new PersonsClient { BaseUrl = "http://localhost:13452" }; ;
 
             //// Act
             var persons = await personsClient.GetAllAsync();
@@ -27,7 +27,7 @@ public async Task GetAll_SerializationTest()
         public async Task GetAll_InheritanceTest()
         {
             //// Arrange
-            var personsClient = new PersonsClient("http://localhost:13452");
+            var personsClient = new PersonsClient { BaseUrl = "http://localhost:13452" };
 
             //// Act
             var persons = await personsClient.GetAllAsync();
@@ -42,7 +42,7 @@ public async Task Throw()
         {
             //// Arrange
             var id = Guid.NewGuid();
-            var personsClient = new PersonsClient("http://localhost:13452");
+            var personsClient = new PersonsClient { BaseUrl = "http://localhost:13452" };
 
             //// Act
             try
diff --git a/src/NSwag.Integration.ClientPCL/ServiceClients.cs b/src/NSwag.Integration.ClientPCL/ServiceClients.cs
@@ -34,19 +34,18 @@ namespace NSwag.Integration.ClientPCL
     [GeneratedCode("NSwag", "6.21.6156.29508")]
     public partial class GeoClient 
     {
-        public GeoClient() : this("http://localhost:13452") { }
-    
-        public GeoClient(string baseUrl)
+        private string _baseUrl = "http://localhost:13452";
+        
+        public string BaseUrl 
         {
-            BaseUrl = baseUrl; 
+            get { return _baseUrl; }
+            set { _baseUrl = value; }
         }
     
         partial void PrepareRequest(HttpClient request, ref string url);
     
         partial void ProcessResponse(HttpClient request, HttpResponseMessage response);
     
-        public string BaseUrl { get; set; }
-    
         /// <exception cref="GeoClientException">A server side error occurred.</exception>
         public Task FromBodyTestAsync(GeoPoint location)
         {
@@ -388,19 +387,18 @@ public async Task<byte[]> GetUploadedFileAsync(int id, CancellationToken cancell
     [GeneratedCode("NSwag", "6.21.6156.29508")]
     public partial class PersonsClient 
     {
-        public PersonsClient() : this("http://localhost:13452") { }
-    
-        public PersonsClient(string baseUrl)
+        private string _baseUrl = "http://localhost:13452";
+        
+        public string BaseUrl 
         {
-            BaseUrl = baseUrl; 
+            get { return _baseUrl; }
+            set { _baseUrl = value; }
         }
     
         partial void PrepareRequest(HttpClient request, ref string url);
     
         partial void ProcessResponse(HttpClient request, HttpResponseMessage response);
     
-        public string BaseUrl { get; set; }
-    
         /// <exception cref="PersonsClientException">A server side error occurred.</exception>
         public Task<ObservableCollection<Person>> GetAllAsync()
         {
diff --git a/src/NSwag.Integration.Console/ServiceClients.cs b/src/NSwag.Integration.Console/ServiceClients.cs
@@ -34,19 +34,18 @@ namespace NSwag.Integration.Console
     [GeneratedCode("NSwag", "6.21.6156.29508")]
     public partial class GeoClient 
     {
-        public GeoClient() : this("http://localhost:13452") { }
-    
-        public GeoClient(string baseUrl)
+        private string _baseUrl = "http://localhost:13452";
+        
+        public string BaseUrl 
         {
-            BaseUrl = baseUrl; 
+            get { return _baseUrl; }
+            set { _baseUrl = value; }
         }
     
         partial void PrepareRequest(HttpClient request, ref string url);
     
         partial void ProcessResponse(HttpClient request, HttpResponseMessage response);
     
-        public string BaseUrl { get; set; }
-    
         /// <exception cref="SwaggerException">A server side error occurred.</exception>
         public Task FromBodyTestAsync(GeoPoint location)
         {
@@ -388,19 +387,18 @@ public async Task<byte[]> GetUploadedFileAsync(int id, CancellationToken cancell
     [GeneratedCode("NSwag", "6.21.6156.29508")]
     public partial class PersonsClient 
     {
-        public PersonsClient() : this("http://localhost:13452") { }
-    
-        public PersonsClient(string baseUrl)
+        private string _baseUrl = "http://localhost:13452";
+        
+        public string BaseUrl 
         {
-            BaseUrl = baseUrl; 
+            get { return _baseUrl; }
+            set { _baseUrl = value; }
         }
     
         partial void PrepareRequest(HttpClient request, ref string url);
     
         partial void ProcessResponse(HttpClient request, HttpResponseMessage response);
     
-        public string BaseUrl { get; set; }
-    
         /// <exception cref="SwaggerException">A server side error occurred.</exception>
         public Task<ObservableCollection<Person>> GetAllAsync()
         {

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ public void When_ConfigurationClass_is_set_then_correct_ctor_is_generated()`
`33`	`33`	`var code = generator.GenerateFile();`
`34`	`34`
`35`	`35`	`//// Assert`
`36`		`- Assert.IsTrue(code.Contains("public FooClient(string baseUrl, MyConfig configuration) : base(configuration)"));`
	`36`	`+ Assert.IsTrue(code.Contains("public FooClient(MyConfig configuration) : base(configuration)"));`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`[TestMethod]`
Original file line number	Diff line number	Diff line change
`@@ -34,19 +34,18 @@ namespace NSwag.Integration.ClientPCL`
`34`	`34`	`[GeneratedCode("NSwag", "6.21.6156.29508")]`
`35`	`35`	`public partial class GeoClient`
`36`	`36`	`{`
`37`		`- public GeoClient() : this("http://localhost:13452") { }`
`38`		`-`
`39`		`- public GeoClient(string baseUrl)`
	`37`	`+ private string _baseUrl = "http://localhost:13452";`
	`38`	`+`
	`39`	`+ public string BaseUrl`
`40`	`40`	`{`
`41`		`- BaseUrl = baseUrl;`
	`41`	`+ get { return _baseUrl; }`
	`42`	`+ set { _baseUrl = value; }`
`42`	`43`	`}`
`43`	`44`
`44`	`45`	`partial void PrepareRequest(HttpClient request, ref string url);`
`45`	`46`
`46`	`47`	`partial void ProcessResponse(HttpClient request, HttpResponseMessage response);`
`47`	`48`
`48`		`- public string BaseUrl { get; set; }`
`49`		`-`
`50`	`49`	`/// <exception cref="GeoClientException">A server side error occurred.</exception>`
`51`	`50`	`public Task FromBodyTestAsync(GeoPoint location)`
`52`	`51`	`{`
`@@ -388,19 +387,18 @@ public async Task<byte[]> GetUploadedFileAsync(int id, CancellationToken cancell`
`388`	`387`	`[GeneratedCode("NSwag", "6.21.6156.29508")]`
`389`	`388`	`public partial class PersonsClient`
`390`	`389`	`{`
`391`		`- public PersonsClient() : this("http://localhost:13452") { }`
`392`		`-`
`393`		`- public PersonsClient(string baseUrl)`
	`390`	`+ private string _baseUrl = "http://localhost:13452";`
	`391`	`+`
	`392`	`+ public string BaseUrl`
`394`	`393`	`{`
`395`		`- BaseUrl = baseUrl;`
	`394`	`+ get { return _baseUrl; }`
	`395`	`+ set { _baseUrl = value; }`
`396`	`396`	`}`
`397`	`397`
`398`	`398`	`partial void PrepareRequest(HttpClient request, ref string url);`
`399`	`399`
`400`	`400`	`partial void ProcessResponse(HttpClient request, HttpResponseMessage response);`
`401`	`401`
`402`		`- public string BaseUrl { get; set; }`
`403`		`-`
`404`	`402`	`/// <exception cref="PersonsClientException">A server side error occurred.</exception>`
`405`	`403`	`public Task<ObservableCollection<Person>> GetAllAsync()`
`406`	`404`	`{`