From a630f0e3348860f5d20290cbc634225f298237d3 Mon Sep 17 00:00:00 2001 From: MattMo Date: Mon, 29 May 2023 06:47:52 -0700 Subject: [PATCH] Fixed a csharp client generator bug. The csharp client generator now outputs a constructor for types that allows setting property/fields. Bumped package version to 1.5.7 --- Rest.Net.Example/Client.Static.cs | 93 +++++++++++++++++++++++---- Rest.Net.Example/Program.cs | 2 +- Rest.Net/Rest.Net.csproj | 2 +- Rest.Net/RestCSharpClientGenerator.cs | 21 ++++++ Rest.Net/RestClientGenerator.cs | 2 +- 5 files changed, 104 insertions(+), 16 deletions(-) diff --git a/Rest.Net.Example/Client.Static.cs b/Rest.Net.Example/Client.Static.cs index bf61b42..7d7d496 100644 --- a/Rest.Net.Example/Client.Static.cs +++ b/Rest.Net.Example/Client.Static.cs @@ -1,3 +1,4 @@ +//Generated using MontoyaTech.Rest.Net using System; using System.Net; using System.Net.Http; @@ -48,7 +49,7 @@ public class StaticClient { var message = new HttpRequestMessage(HttpMethod.Get, $"{StaticClient.BaseUrl}/status"); - var response = StaticClient.HttpClient.Send(message); + var response = StaticClient.HttpClient.Send(message, HttpCompletionOption.ResponseHeadersRead); if (response.IsSuccessStatusCode) { @@ -69,7 +70,7 @@ public class StaticClient { var message = new HttpRequestMessage(HttpMethod.Post, $"{StaticClient.BaseUrl}/add/{a}/{b}"); - var response = StaticClient.HttpClient.Send(message); + var response = StaticClient.HttpClient.Send(message, HttpCompletionOption.ResponseHeadersRead); if (response.IsSuccessStatusCode) { @@ -90,7 +91,7 @@ public class StaticClient { var message = new HttpRequestMessage(HttpMethod.Get, $"{StaticClient.BaseUrl}/compress"); - var response = StaticClient.HttpClient.Send(message); + var response = StaticClient.HttpClient.Send(message, HttpCompletionOption.ResponseHeadersRead); if (response.IsSuccessStatusCode) { @@ -111,7 +112,7 @@ public class StaticClient { var message = new HttpRequestMessage(HttpMethod.Get, $"{StaticClient.BaseUrl}/file/compress"); - var response = StaticClient.HttpClient.Send(message); + var response = StaticClient.HttpClient.Send(message, HttpCompletionOption.ResponseHeadersRead); if (response.IsSuccessStatusCode) { @@ -135,7 +136,7 @@ public class StaticClient { var message = new HttpRequestMessage(HttpMethod.Get, $"{StaticClient.BaseUrl}/auth/{name}"); - var response = StaticClient.HttpClient.Send(message); + var response = StaticClient.HttpClient.Send(message, HttpCompletionOption.ResponseHeadersRead); if (response.IsSuccessStatusCode) { @@ -158,7 +159,7 @@ public class StaticClient message.Content = new StringContent(JsonConvert.SerializeObject(request)); - var response = StaticClient.HttpClient.Send(message); + var response = StaticClient.HttpClient.Send(message, HttpCompletionOption.ResponseHeadersRead); if (!response.IsSuccessStatusCode) throw new Exception("Unexpected Http Response StatusCode:" + response.StatusCode); @@ -168,7 +169,7 @@ public class StaticClient { var message = new HttpRequestMessage(HttpMethod.Get, $"{StaticClient.BaseUrl}/auth"); - var response = StaticClient.HttpClient.Send(message); + var response = StaticClient.HttpClient.Send(message, HttpCompletionOption.ResponseHeadersRead); if (response.IsSuccessStatusCode) { @@ -189,7 +190,7 @@ public class StaticClient { var message = new HttpRequestMessage(HttpMethod.Get, $"{StaticClient.BaseUrl}/auth/role"); - var response = StaticClient.HttpClient.Send(message); + var response = StaticClient.HttpClient.Send(message, HttpCompletionOption.ResponseHeadersRead); if (response.IsSuccessStatusCode) { @@ -217,7 +218,7 @@ public class StaticClient message.Content = new StreamContent(request); - var response = StaticClient.HttpClient.Send(message); + var response = StaticClient.HttpClient.Send(message, HttpCompletionOption.ResponseHeadersRead); if (!response.IsSuccessStatusCode) throw new Exception("Unexpected Http Response StatusCode:" + response.StatusCode); @@ -227,15 +228,13 @@ public class StaticClient { var message = new HttpRequestMessage(HttpMethod.Get, $"{StaticClient.BaseUrl}/download"); - var response = StaticClient.HttpClient.Send(message); + var response = StaticClient.HttpClient.Send(message, HttpCompletionOption.ResponseHeadersRead); if (response.IsSuccessStatusCode) { var stream = new System.IO.MemoryStream(); - response.Content.ReadAsStream().CopyTo(stream); - - stream.Seek(0, System.IO.SeekOrigin.Begin); + response.Content.CopyToAsync(stream).GetAwaiter().GetResult(); return stream; } @@ -249,6 +248,18 @@ public class StaticClient public class IncludedType { public int Test; + + public IncludedType() { } + + public IncludedType(IncludedType instance) + { + this.Test = instance.Test; + } + + public IncludedType(int Test = 0) + { + this.Test = Test; + } } public class UserDto : BaseUser @@ -259,23 +270,79 @@ public class StaticClient public System.Collections.Generic.List List; + public System.String[] Array; + public ulong Property { get; set; } + + public UserDto() { } + + public UserDto(UserDto instance) + { + this.MachineType = instance.MachineType; + this.Name = instance.Name; + this.List = instance.List; + this.Array = instance.Array; + this.Property = instance.Property; + } + + public UserDto(System.PlatformID MachineType = 0, string Name = null, System.Collections.Generic.List List = null, System.String[] Array = null, ulong Property = 0) + { + this.MachineType = MachineType; + this.Name = Name; + this.List = List; + this.Array = Array; + this.Property = Property; + } } public class BaseUser { public string Id; + public char FirstInitial; + public System.Collections.Generic.List Permissions; public UserRole Role { get; set; } + public BaseUser() { } + + public BaseUser(BaseUser instance) + { + this.Id = instance.Id; + this.FirstInitial = instance.FirstInitial; + this.Permissions = instance.Permissions; + this.Role = instance.Role; + } + + public BaseUser(string Id = null, char FirstInitial = '\0', System.Collections.Generic.List Permissions = null, UserRole Role = 0) + { + this.Id = Id; + this.FirstInitial = FirstInitial; + this.Permissions = Permissions; + this.Role = Role; + } + public class Permission { public string Name; public Types Type; + public Permission() { } + + public Permission(Permission instance) + { + this.Name = instance.Name; + this.Type = instance.Type; + } + + public Permission(string Name = null, Types Type = 0) + { + this.Name = Name; + this.Type = Type; + } + public enum Types : int { Read = 0, diff --git a/Rest.Net.Example/Program.cs b/Rest.Net.Example/Program.cs index 3a15f7f..bf6573f 100644 --- a/Rest.Net.Example/Program.cs +++ b/Rest.Net.Example/Program.cs @@ -219,7 +219,7 @@ namespace MontoyaTech.Rest.Net.Example } [RouteGroup("Stream")] - [RouteResponse(typeof(FileStream), Parameter = true)] + [RouteResponse(typeof(MemoryStream), Parameter = false)] public static HttpListenerResponse Download(HttpListenerContext context) { return context.Response.WithStatus(HttpStatusCode.OK).WithText("Hello world"); diff --git a/Rest.Net/Rest.Net.csproj b/Rest.Net/Rest.Net.csproj index a3ada43..4c96c49 100644 --- a/Rest.Net/Rest.Net.csproj +++ b/Rest.Net/Rest.Net.csproj @@ -17,7 +17,7 @@ MontoyaTech.Rest.Net MontoyaTech.Rest.Net True - 1.5.6 + 1.5.7 Logo_Symbol_Black_Outline.png diff --git a/Rest.Net/RestCSharpClientGenerator.cs b/Rest.Net/RestCSharpClientGenerator.cs index 3406026..b1c9e94 100644 --- a/Rest.Net/RestCSharpClientGenerator.cs +++ b/Rest.Net/RestCSharpClientGenerator.cs @@ -236,6 +236,27 @@ namespace MontoyaTech.Rest.Net writer.WriteLine($"this.{property.Name} = instance.{property.Name};"); writer.Outdent().WriteLine('}'); + + //Generate a constructor to set all the fields/properties with optional default values + writer.WriteBreak(); + writer.Write($"public {(newName != null ? newName.Name : type.Name)}("); + + foreach (var field in fields) + writer.WriteSeparator().Write($"{this.GetTypeFullyResolvedName(field.FieldType)} {field.Name} = {this.GetTypeDefaultValue(field.FieldType)}"); + + foreach (var property in properties) + writer.WriteSeparator().Write($"{this.GetTypeFullyResolvedName(property.PropertyType)} {property.Name} = {this.GetTypeDefaultValue(property.PropertyType)}"); + + writer.WriteLine(")"); + writer.WriteLine('{').Indent(); + + foreach (var field in fields) + writer.WriteLine($"this.{field.Name} = {field.Name};"); + + foreach (var property in properties) + writer.WriteLine($"this.{property.Name} = {property.Name};"); + + writer.Outdent().WriteLine('}'); } //Generate C# for any types that belong to this one. diff --git a/Rest.Net/RestClientGenerator.cs b/Rest.Net/RestClientGenerator.cs index 706ad9a..22b54a1 100644 --- a/Rest.Net/RestClientGenerator.cs +++ b/Rest.Net/RestClientGenerator.cs @@ -356,7 +356,7 @@ namespace MontoyaTech.Rest.Net else if (typeCode == TypeCode.String || typeCode == TypeCode.Object) return "null"; else if (typeCode == TypeCode.Char) - return "'\0'"; + return "'\\0'"; else return Activator.CreateInstance(type).ToString(); }