From 8efcc2c62d1c89338d2097a695a30cd94aac0148 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jean-Fran=C3=A7ois=20C=C3=B4t=C3=A9?= Date: Tue, 16 May 2023 14:42:51 -0400 Subject: [PATCH] Update samples for aspnetcore --- .../src/Org.OpenAPITools/Models/Order.cs | 6 +- .../src/Org.OpenAPITools/Models/Order.cs | 6 +- .../src/Org.OpenAPITools/Models/Order.cs | 6 +- .../src/Org.OpenAPITools/Models/Order.cs | 2 +- .../src/Org.OpenAPITools.Models/Order.cs | 6 +- .../Converters/CustomEnumConverter.cs | 42 ---- .../Org.OpenAPITools/Models/ApiResponse.cs | 147 ------------ .../src/Org.OpenAPITools/Models/Category.cs | 134 ----------- .../src/Org.OpenAPITools/Models/Order.cs | 219 ----------------- .../src/Org.OpenAPITools/Models/Pet.cs | 223 ------------------ .../src/Org.OpenAPITools/Models/Tag.cs | 133 ----------- .../src/Org.OpenAPITools/Models/User.cs | 218 ----------------- .../src/Org.OpenAPITools/Models/Order.cs | 6 +- .../src/Org.OpenAPITools/Models/Order.cs | 6 +- .../src/Org.OpenAPITools/Models/Order.cs | 6 +- .../src/Org.OpenAPITools/Models/Order.cs | 4 +- 16 files changed, 24 insertions(+), 1140 deletions(-) delete mode 100644 samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Converters/CustomEnumConverter.cs delete mode 100644 samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Models/ApiResponse.cs delete mode 100644 samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Models/Category.cs delete mode 100644 samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Models/Order.cs delete mode 100644 samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Models/Pet.cs delete mode 100644 samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Models/Tag.cs delete mode 100644 samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Models/User.cs diff --git a/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Models/Order.cs b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Models/Order.cs index 5da36e6f1fd..5076e34732a 100644 --- a/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Models/Order.cs +++ b/samples/server/petstore/aspnetcore-3.0/src/Org.OpenAPITools/Models/Order.cs @@ -47,7 +47,7 @@ namespace Org.OpenAPITools.Models /// /// Gets or Sets ShipDate /// - [DataMember(Name="shipDate", EmitDefaultValue=false)] + [DataMember(Name="shipDate", EmitDefaultValue=true)] public DateTime ShipDate { get; set; } @@ -159,7 +159,7 @@ namespace Org.OpenAPITools.Models ) && ( ShipDate == other.ShipDate || - ShipDate != null && + ShipDate.Equals(other.ShipDate) ) && ( @@ -190,7 +190,7 @@ namespace Org.OpenAPITools.Models hashCode = hashCode * 59 + PetId.GetHashCode(); hashCode = hashCode * 59 + Quantity.GetHashCode(); - if (ShipDate != null) + hashCode = hashCode * 59 + ShipDate.GetHashCode(); hashCode = hashCode * 59 + Status.GetHashCode(); diff --git a/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Models/Order.cs b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Models/Order.cs index 5da36e6f1fd..5076e34732a 100644 --- a/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Models/Order.cs +++ b/samples/server/petstore/aspnetcore-3.1/src/Org.OpenAPITools/Models/Order.cs @@ -47,7 +47,7 @@ namespace Org.OpenAPITools.Models /// /// Gets or Sets ShipDate /// - [DataMember(Name="shipDate", EmitDefaultValue=false)] + [DataMember(Name="shipDate", EmitDefaultValue=true)] public DateTime ShipDate { get; set; } @@ -159,7 +159,7 @@ namespace Org.OpenAPITools.Models ) && ( ShipDate == other.ShipDate || - ShipDate != null && + ShipDate.Equals(other.ShipDate) ) && ( @@ -190,7 +190,7 @@ namespace Org.OpenAPITools.Models hashCode = hashCode * 59 + PetId.GetHashCode(); hashCode = hashCode * 59 + Quantity.GetHashCode(); - if (ShipDate != null) + hashCode = hashCode * 59 + ShipDate.GetHashCode(); hashCode = hashCode * 59 + Status.GetHashCode(); diff --git a/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Models/Order.cs b/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Models/Order.cs index 5da36e6f1fd..5076e34732a 100644 --- a/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Models/Order.cs +++ b/samples/server/petstore/aspnetcore-5.0/src/Org.OpenAPITools/Models/Order.cs @@ -47,7 +47,7 @@ namespace Org.OpenAPITools.Models /// /// Gets or Sets ShipDate /// - [DataMember(Name="shipDate", EmitDefaultValue=false)] + [DataMember(Name="shipDate", EmitDefaultValue=true)] public DateTime ShipDate { get; set; } @@ -159,7 +159,7 @@ namespace Org.OpenAPITools.Models ) && ( ShipDate == other.ShipDate || - ShipDate != null && + ShipDate.Equals(other.ShipDate) ) && ( @@ -190,7 +190,7 @@ namespace Org.OpenAPITools.Models hashCode = hashCode * 59 + PetId.GetHashCode(); hashCode = hashCode * 59 + Quantity.GetHashCode(); - if (ShipDate != null) + hashCode = hashCode * 59 + ShipDate.GetHashCode(); hashCode = hashCode * 59 + Status.GetHashCode(); diff --git a/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Models/Order.cs b/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Models/Order.cs index e45bab015c4..7a68506eaa4 100644 --- a/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Models/Order.cs +++ b/samples/server/petstore/aspnetcore-6.0-pocoModels/src/Org.OpenAPITools/Models/Order.cs @@ -47,7 +47,7 @@ namespace Org.OpenAPITools.Models /// /// Gets or Sets ShipDate /// - [DataMember(Name="shipDate", EmitDefaultValue=false)] + [DataMember(Name="shipDate", EmitDefaultValue=true)] public DateTime ShipDate { get; set; } diff --git a/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools.Models/Order.cs b/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools.Models/Order.cs index 5da36e6f1fd..5076e34732a 100644 --- a/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools.Models/Order.cs +++ b/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools.Models/Order.cs @@ -47,7 +47,7 @@ namespace Org.OpenAPITools.Models /// /// Gets or Sets ShipDate /// - [DataMember(Name="shipDate", EmitDefaultValue=false)] + [DataMember(Name="shipDate", EmitDefaultValue=true)] public DateTime ShipDate { get; set; } @@ -159,7 +159,7 @@ namespace Org.OpenAPITools.Models ) && ( ShipDate == other.ShipDate || - ShipDate != null && + ShipDate.Equals(other.ShipDate) ) && ( @@ -190,7 +190,7 @@ namespace Org.OpenAPITools.Models hashCode = hashCode * 59 + PetId.GetHashCode(); hashCode = hashCode * 59 + Quantity.GetHashCode(); - if (ShipDate != null) + hashCode = hashCode * 59 + ShipDate.GetHashCode(); hashCode = hashCode * 59 + Status.GetHashCode(); diff --git a/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Converters/CustomEnumConverter.cs b/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Converters/CustomEnumConverter.cs deleted file mode 100644 index 00b75a3cc7c..00000000000 --- a/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Converters/CustomEnumConverter.cs +++ /dev/null @@ -1,42 +0,0 @@ -using System; -using System.ComponentModel; -using System.Globalization; -using Newtonsoft.Json; - -namespace Org.OpenAPITools.Converters -{ - /// - /// Custom string to enum converter - /// - public class CustomEnumConverter : TypeConverter - { - /// - /// Determine if we can convert a type to an enum - /// - /// - /// - /// - public override bool CanConvertFrom(ITypeDescriptorContext context, Type sourceType) - { - return sourceType == typeof(string) || base.CanConvertFrom(context, sourceType); - } - - /// - /// Convert from a type value to an enum - /// - /// - /// - /// - /// - public override object ConvertFrom(ITypeDescriptorContext context, CultureInfo culture, object value) - { - var s = value as string; - if (string.IsNullOrEmpty(s)) - { - return null; - } - - return JsonConvert.DeserializeObject(@"""" + value.ToString() + @""""); - } - } -} diff --git a/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Models/ApiResponse.cs b/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Models/ApiResponse.cs deleted file mode 100644 index 7573feaf410..00000000000 --- a/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Models/ApiResponse.cs +++ /dev/null @@ -1,147 +0,0 @@ -/* - * OpenAPI Petstore - * - * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. - * - * The version of the OpenAPI document: 1.0.0 - * - * Generated by: https://openapi-generator.tech - */ - -using System; -using System.Linq; -using System.Text; -using System.Collections.Generic; -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using System.Runtime.Serialization; -using Newtonsoft.Json; -using Org.OpenAPITools.Converters; - -namespace Org.OpenAPITools.Models -{ - /// - /// Describes the result of uploading an image resource - /// - [DataContract] - public partial class ApiResponse : IEquatable - { - /// - /// Gets or Sets Code - /// - [DataMember(Name="code", EmitDefaultValue=true)] - public int Code { get; set; } - - /// - /// Gets or Sets Type - /// - [DataMember(Name="type", EmitDefaultValue=false)] - public string Type { get; set; } - - /// - /// Gets or Sets Message - /// - [DataMember(Name="message", EmitDefaultValue=false)] - public string Message { get; set; } - - /// - /// Returns the string presentation of the object - /// - /// String presentation of the object - public override string ToString() - { - var sb = new StringBuilder(); - sb.Append("class ApiResponse {\n"); - sb.Append(" Code: ").Append(Code).Append("\n"); - sb.Append(" Type: ").Append(Type).Append("\n"); - sb.Append(" Message: ").Append(Message).Append("\n"); - sb.Append("}\n"); - return sb.ToString(); - } - - /// - /// Returns the JSON string presentation of the object - /// - /// JSON string presentation of the object - public string ToJson() - { - return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); - } - - /// - /// Returns true if objects are equal - /// - /// Object to be compared - /// Boolean - public override bool Equals(object obj) - { - if (obj is null) return false; - if (ReferenceEquals(this, obj)) return true; - return obj.GetType() == GetType() && Equals((ApiResponse)obj); - } - - /// - /// Returns true if ApiResponse instances are equal - /// - /// Instance of ApiResponse to be compared - /// Boolean - public bool Equals(ApiResponse other) - { - if (other is null) return false; - if (ReferenceEquals(this, other)) return true; - - return - ( - Code == other.Code || - - Code.Equals(other.Code) - ) && - ( - Type == other.Type || - Type != null && - Type.Equals(other.Type) - ) && - ( - Message == other.Message || - Message != null && - Message.Equals(other.Message) - ); - } - - /// - /// Gets the hash code - /// - /// Hash code - public override int GetHashCode() - { - unchecked // Overflow is fine, just wrap - { - var hashCode = 41; - // Suitable nullity checks etc, of course :) - - hashCode = hashCode * 59 + Code.GetHashCode(); - if (Type != null) - hashCode = hashCode * 59 + Type.GetHashCode(); - if (Message != null) - hashCode = hashCode * 59 + Message.GetHashCode(); - return hashCode; - } - } - - #region Operators - #pragma warning disable 1591 - - public static bool operator ==(ApiResponse left, ApiResponse right) - { - return Equals(left, right); - } - - public static bool operator !=(ApiResponse left, ApiResponse right) - { - return !Equals(left, right); - } - - #pragma warning restore 1591 - #endregion Operators - } -} diff --git a/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Models/Category.cs b/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Models/Category.cs deleted file mode 100644 index 0d63dc9d7e6..00000000000 --- a/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Models/Category.cs +++ /dev/null @@ -1,134 +0,0 @@ -/* - * OpenAPI Petstore - * - * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. - * - * The version of the OpenAPI document: 1.0.0 - * - * Generated by: https://openapi-generator.tech - */ - -using System; -using System.Linq; -using System.Text; -using System.Collections.Generic; -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using System.Runtime.Serialization; -using Newtonsoft.Json; -using Org.OpenAPITools.Converters; - -namespace Org.OpenAPITools.Models -{ - /// - /// A category for a pet - /// - [DataContract] - public partial class Category : IEquatable - { - /// - /// Gets or Sets Id - /// - [DataMember(Name="id", EmitDefaultValue=true)] - public long Id { get; set; } - - /// - /// Gets or Sets Name - /// - [RegularExpression("^[a-zA-Z0-9]+[a-zA-Z0-9\\.\\-_]*[a-zA-Z0-9]+$")] - [DataMember(Name="name", EmitDefaultValue=false)] - public string Name { get; set; } - - /// - /// Returns the string presentation of the object - /// - /// String presentation of the object - public override string ToString() - { - var sb = new StringBuilder(); - sb.Append("class Category {\n"); - sb.Append(" Id: ").Append(Id).Append("\n"); - sb.Append(" Name: ").Append(Name).Append("\n"); - sb.Append("}\n"); - return sb.ToString(); - } - - /// - /// Returns the JSON string presentation of the object - /// - /// JSON string presentation of the object - public string ToJson() - { - return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); - } - - /// - /// Returns true if objects are equal - /// - /// Object to be compared - /// Boolean - public override bool Equals(object obj) - { - if (obj is null) return false; - if (ReferenceEquals(this, obj)) return true; - return obj.GetType() == GetType() && Equals((Category)obj); - } - - /// - /// Returns true if Category instances are equal - /// - /// Instance of Category to be compared - /// Boolean - public bool Equals(Category other) - { - if (other is null) return false; - if (ReferenceEquals(this, other)) return true; - - return - ( - Id == other.Id || - - Id.Equals(other.Id) - ) && - ( - Name == other.Name || - Name != null && - Name.Equals(other.Name) - ); - } - - /// - /// Gets the hash code - /// - /// Hash code - public override int GetHashCode() - { - unchecked // Overflow is fine, just wrap - { - var hashCode = 41; - // Suitable nullity checks etc, of course :) - - hashCode = hashCode * 59 + Id.GetHashCode(); - if (Name != null) - hashCode = hashCode * 59 + Name.GetHashCode(); - return hashCode; - } - } - - #region Operators - #pragma warning disable 1591 - - public static bool operator ==(Category left, Category right) - { - return Equals(left, right); - } - - public static bool operator !=(Category left, Category right) - { - return !Equals(left, right); - } - - #pragma warning restore 1591 - #endregion Operators - } -} diff --git a/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Models/Order.cs b/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Models/Order.cs deleted file mode 100644 index 1d972579269..00000000000 --- a/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Models/Order.cs +++ /dev/null @@ -1,219 +0,0 @@ -/* - * OpenAPI Petstore - * - * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. - * - * The version of the OpenAPI document: 1.0.0 - * - * Generated by: https://openapi-generator.tech - */ - -using System; -using System.Linq; -using System.Text; -using System.Collections.Generic; -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using System.Runtime.Serialization; -using Newtonsoft.Json; -using Org.OpenAPITools.Converters; - -namespace Org.OpenAPITools.Models -{ - /// - /// An order for a pets from the pet store - /// - [DataContract] - public partial class Order : IEquatable - { - /// - /// Gets or Sets Id - /// - [DataMember(Name="id", EmitDefaultValue=true)] - public long Id { get; set; } - - /// - /// Gets or Sets PetId - /// - [DataMember(Name="petId", EmitDefaultValue=true)] - public long PetId { get; set; } - - /// - /// Gets or Sets Quantity - /// - [DataMember(Name="quantity", EmitDefaultValue=true)] - public int Quantity { get; set; } - - /// - /// Gets or Sets ShipDate - /// - [DataMember(Name="shipDate", EmitDefaultValue=false)] - public DateTime ShipDate { get; set; } - - - /// - /// Order Status - /// - /// Order Status - [TypeConverter(typeof(CustomEnumConverter))] - [JsonConverter(typeof(Newtonsoft.Json.Converters.StringEnumConverter))] - public enum StatusEnum - { - - /// - /// Enum PlacedEnum for placed - /// - [EnumMember(Value = "placed")] - PlacedEnum = 1, - - /// - /// Enum ApprovedEnum for approved - /// - [EnumMember(Value = "approved")] - ApprovedEnum = 2, - - /// - /// Enum DeliveredEnum for delivered - /// - [EnumMember(Value = "delivered")] - DeliveredEnum = 3 - } - - /// - /// Order Status - /// - /// Order Status - [DataMember(Name="status", EmitDefaultValue=true)] - public StatusEnum Status { get; set; } - - /// - /// Gets or Sets Complete - /// - [DataMember(Name="complete", EmitDefaultValue=true)] - public bool Complete { get; set; } = false; - - /// - /// Returns the string presentation of the object - /// - /// String presentation of the object - public override string ToString() - { - var sb = new StringBuilder(); - sb.Append("class Order {\n"); - sb.Append(" Id: ").Append(Id).Append("\n"); - sb.Append(" PetId: ").Append(PetId).Append("\n"); - sb.Append(" Quantity: ").Append(Quantity).Append("\n"); - sb.Append(" ShipDate: ").Append(ShipDate).Append("\n"); - sb.Append(" Status: ").Append(Status).Append("\n"); - sb.Append(" Complete: ").Append(Complete).Append("\n"); - sb.Append("}\n"); - return sb.ToString(); - } - - /// - /// Returns the JSON string presentation of the object - /// - /// JSON string presentation of the object - public string ToJson() - { - return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); - } - - /// - /// Returns true if objects are equal - /// - /// Object to be compared - /// Boolean - public override bool Equals(object obj) - { - if (obj is null) return false; - if (ReferenceEquals(this, obj)) return true; - return obj.GetType() == GetType() && Equals((Order)obj); - } - - /// - /// Returns true if Order instances are equal - /// - /// Instance of Order to be compared - /// Boolean - public bool Equals(Order other) - { - if (other is null) return false; - if (ReferenceEquals(this, other)) return true; - - return - ( - Id == other.Id || - - Id.Equals(other.Id) - ) && - ( - PetId == other.PetId || - - PetId.Equals(other.PetId) - ) && - ( - Quantity == other.Quantity || - - Quantity.Equals(other.Quantity) - ) && - ( - ShipDate == other.ShipDate || - ShipDate != null && - ShipDate.Equals(other.ShipDate) - ) && - ( - Status == other.Status || - - Status.Equals(other.Status) - ) && - ( - Complete == other.Complete || - - Complete.Equals(other.Complete) - ); - } - - /// - /// Gets the hash code - /// - /// Hash code - public override int GetHashCode() - { - unchecked // Overflow is fine, just wrap - { - var hashCode = 41; - // Suitable nullity checks etc, of course :) - - hashCode = hashCode * 59 + Id.GetHashCode(); - - hashCode = hashCode * 59 + PetId.GetHashCode(); - - hashCode = hashCode * 59 + Quantity.GetHashCode(); - if (ShipDate != null) - hashCode = hashCode * 59 + ShipDate.GetHashCode(); - - hashCode = hashCode * 59 + Status.GetHashCode(); - - hashCode = hashCode * 59 + Complete.GetHashCode(); - return hashCode; - } - } - - #region Operators - #pragma warning disable 1591 - - public static bool operator ==(Order left, Order right) - { - return Equals(left, right); - } - - public static bool operator !=(Order left, Order right) - { - return !Equals(left, right); - } - - #pragma warning restore 1591 - #endregion Operators - } -} diff --git a/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Models/Pet.cs b/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Models/Pet.cs deleted file mode 100644 index 762279e4d6d..00000000000 --- a/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Models/Pet.cs +++ /dev/null @@ -1,223 +0,0 @@ -/* - * OpenAPI Petstore - * - * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. - * - * The version of the OpenAPI document: 1.0.0 - * - * Generated by: https://openapi-generator.tech - */ - -using System; -using System.Linq; -using System.Text; -using System.Collections.Generic; -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using System.Runtime.Serialization; -using Newtonsoft.Json; -using Org.OpenAPITools.Converters; - -namespace Org.OpenAPITools.Models -{ - /// - /// A pet for sale in the pet store - /// - [DataContract] - public partial class Pet : IEquatable - { - /// - /// Gets or Sets Id - /// - [DataMember(Name="id", EmitDefaultValue=true)] - public long Id { get; set; } - - /// - /// Gets or Sets Category - /// - [DataMember(Name="category", EmitDefaultValue=false)] - public Category Category { get; set; } - - /// - /// Gets or Sets Name - /// - [Required] - [DataMember(Name="name", EmitDefaultValue=false)] - public string Name { get; set; } - - /// - /// Gets or Sets PhotoUrls - /// - [Required] - [DataMember(Name="photoUrls", EmitDefaultValue=false)] - public List PhotoUrls { get; set; } - - /// - /// Gets or Sets Tags - /// - [DataMember(Name="tags", EmitDefaultValue=false)] - public List Tags { get; set; } - - - /// - /// pet status in the store - /// - /// pet status in the store - [TypeConverter(typeof(CustomEnumConverter))] - [JsonConverter(typeof(Newtonsoft.Json.Converters.StringEnumConverter))] - public enum StatusEnum - { - - /// - /// Enum AvailableEnum for available - /// - [EnumMember(Value = "available")] - AvailableEnum = 1, - - /// - /// Enum PendingEnum for pending - /// - [EnumMember(Value = "pending")] - PendingEnum = 2, - - /// - /// Enum SoldEnum for sold - /// - [EnumMember(Value = "sold")] - SoldEnum = 3 - } - - /// - /// pet status in the store - /// - /// pet status in the store - [DataMember(Name="status", EmitDefaultValue=true)] - public StatusEnum Status { get; set; } - - /// - /// Returns the string presentation of the object - /// - /// String presentation of the object - public override string ToString() - { - var sb = new StringBuilder(); - sb.Append("class Pet {\n"); - sb.Append(" Id: ").Append(Id).Append("\n"); - sb.Append(" Category: ").Append(Category).Append("\n"); - sb.Append(" Name: ").Append(Name).Append("\n"); - sb.Append(" PhotoUrls: ").Append(PhotoUrls).Append("\n"); - sb.Append(" Tags: ").Append(Tags).Append("\n"); - sb.Append(" Status: ").Append(Status).Append("\n"); - sb.Append("}\n"); - return sb.ToString(); - } - - /// - /// Returns the JSON string presentation of the object - /// - /// JSON string presentation of the object - public string ToJson() - { - return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); - } - - /// - /// Returns true if objects are equal - /// - /// Object to be compared - /// Boolean - public override bool Equals(object obj) - { - if (obj is null) return false; - if (ReferenceEquals(this, obj)) return true; - return obj.GetType() == GetType() && Equals((Pet)obj); - } - - /// - /// Returns true if Pet instances are equal - /// - /// Instance of Pet to be compared - /// Boolean - public bool Equals(Pet other) - { - if (other is null) return false; - if (ReferenceEquals(this, other)) return true; - - return - ( - Id == other.Id || - - Id.Equals(other.Id) - ) && - ( - Category == other.Category || - Category != null && - Category.Equals(other.Category) - ) && - ( - Name == other.Name || - Name != null && - Name.Equals(other.Name) - ) && - ( - PhotoUrls == other.PhotoUrls || - PhotoUrls != null && - other.PhotoUrls != null && - PhotoUrls.SequenceEqual(other.PhotoUrls) - ) && - ( - Tags == other.Tags || - Tags != null && - other.Tags != null && - Tags.SequenceEqual(other.Tags) - ) && - ( - Status == other.Status || - - Status.Equals(other.Status) - ); - } - - /// - /// Gets the hash code - /// - /// Hash code - public override int GetHashCode() - { - unchecked // Overflow is fine, just wrap - { - var hashCode = 41; - // Suitable nullity checks etc, of course :) - - hashCode = hashCode * 59 + Id.GetHashCode(); - if (Category != null) - hashCode = hashCode * 59 + Category.GetHashCode(); - if (Name != null) - hashCode = hashCode * 59 + Name.GetHashCode(); - if (PhotoUrls != null) - hashCode = hashCode * 59 + PhotoUrls.GetHashCode(); - if (Tags != null) - hashCode = hashCode * 59 + Tags.GetHashCode(); - - hashCode = hashCode * 59 + Status.GetHashCode(); - return hashCode; - } - } - - #region Operators - #pragma warning disable 1591 - - public static bool operator ==(Pet left, Pet right) - { - return Equals(left, right); - } - - public static bool operator !=(Pet left, Pet right) - { - return !Equals(left, right); - } - - #pragma warning restore 1591 - #endregion Operators - } -} diff --git a/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Models/Tag.cs b/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Models/Tag.cs deleted file mode 100644 index 5153ae0c4bb..00000000000 --- a/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Models/Tag.cs +++ /dev/null @@ -1,133 +0,0 @@ -/* - * OpenAPI Petstore - * - * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. - * - * The version of the OpenAPI document: 1.0.0 - * - * Generated by: https://openapi-generator.tech - */ - -using System; -using System.Linq; -using System.Text; -using System.Collections.Generic; -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using System.Runtime.Serialization; -using Newtonsoft.Json; -using Org.OpenAPITools.Converters; - -namespace Org.OpenAPITools.Models -{ - /// - /// A tag for a pet - /// - [DataContract] - public partial class Tag : IEquatable - { - /// - /// Gets or Sets Id - /// - [DataMember(Name="id", EmitDefaultValue=true)] - public long Id { get; set; } - - /// - /// Gets or Sets Name - /// - [DataMember(Name="name", EmitDefaultValue=false)] - public string Name { get; set; } - - /// - /// Returns the string presentation of the object - /// - /// String presentation of the object - public override string ToString() - { - var sb = new StringBuilder(); - sb.Append("class Tag {\n"); - sb.Append(" Id: ").Append(Id).Append("\n"); - sb.Append(" Name: ").Append(Name).Append("\n"); - sb.Append("}\n"); - return sb.ToString(); - } - - /// - /// Returns the JSON string presentation of the object - /// - /// JSON string presentation of the object - public string ToJson() - { - return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); - } - - /// - /// Returns true if objects are equal - /// - /// Object to be compared - /// Boolean - public override bool Equals(object obj) - { - if (obj is null) return false; - if (ReferenceEquals(this, obj)) return true; - return obj.GetType() == GetType() && Equals((Tag)obj); - } - - /// - /// Returns true if Tag instances are equal - /// - /// Instance of Tag to be compared - /// Boolean - public bool Equals(Tag other) - { - if (other is null) return false; - if (ReferenceEquals(this, other)) return true; - - return - ( - Id == other.Id || - - Id.Equals(other.Id) - ) && - ( - Name == other.Name || - Name != null && - Name.Equals(other.Name) - ); - } - - /// - /// Gets the hash code - /// - /// Hash code - public override int GetHashCode() - { - unchecked // Overflow is fine, just wrap - { - var hashCode = 41; - // Suitable nullity checks etc, of course :) - - hashCode = hashCode * 59 + Id.GetHashCode(); - if (Name != null) - hashCode = hashCode * 59 + Name.GetHashCode(); - return hashCode; - } - } - - #region Operators - #pragma warning disable 1591 - - public static bool operator ==(Tag left, Tag right) - { - return Equals(left, right); - } - - public static bool operator !=(Tag left, Tag right) - { - return !Equals(left, right); - } - - #pragma warning restore 1591 - #endregion Operators - } -} diff --git a/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Models/User.cs b/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Models/User.cs deleted file mode 100644 index a64c031e615..00000000000 --- a/samples/server/petstore/aspnetcore-6.0-project4Models/src/Org.OpenAPITools/Models/User.cs +++ /dev/null @@ -1,218 +0,0 @@ -/* - * OpenAPI Petstore - * - * This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters. - * - * The version of the OpenAPI document: 1.0.0 - * - * Generated by: https://openapi-generator.tech - */ - -using System; -using System.Linq; -using System.Text; -using System.Collections.Generic; -using System.ComponentModel; -using System.ComponentModel.DataAnnotations; -using System.Runtime.Serialization; -using Newtonsoft.Json; -using Org.OpenAPITools.Converters; - -namespace Org.OpenAPITools.Models -{ - /// - /// A User who is purchasing from the pet store - /// - [DataContract] - public partial class User : IEquatable - { - /// - /// Gets or Sets Id - /// - [DataMember(Name="id", EmitDefaultValue=true)] - public long Id { get; set; } - - /// - /// Gets or Sets Username - /// - [DataMember(Name="username", EmitDefaultValue=false)] - public string Username { get; set; } - - /// - /// Gets or Sets FirstName - /// - [DataMember(Name="firstName", EmitDefaultValue=false)] - public string FirstName { get; set; } - - /// - /// Gets or Sets LastName - /// - [DataMember(Name="lastName", EmitDefaultValue=false)] - public string LastName { get; set; } - - /// - /// Gets or Sets Email - /// - [DataMember(Name="email", EmitDefaultValue=false)] - public string Email { get; set; } - - /// - /// Gets or Sets Password - /// - [DataMember(Name="password", EmitDefaultValue=false)] - public string Password { get; set; } - - /// - /// Gets or Sets Phone - /// - [DataMember(Name="phone", EmitDefaultValue=false)] - public string Phone { get; set; } - - /// - /// User Status - /// - /// User Status - [DataMember(Name="userStatus", EmitDefaultValue=true)] - public int UserStatus { get; set; } - - /// - /// Returns the string presentation of the object - /// - /// String presentation of the object - public override string ToString() - { - var sb = new StringBuilder(); - sb.Append("class User {\n"); - sb.Append(" Id: ").Append(Id).Append("\n"); - sb.Append(" Username: ").Append(Username).Append("\n"); - sb.Append(" FirstName: ").Append(FirstName).Append("\n"); - sb.Append(" LastName: ").Append(LastName).Append("\n"); - sb.Append(" Email: ").Append(Email).Append("\n"); - sb.Append(" Password: ").Append(Password).Append("\n"); - sb.Append(" Phone: ").Append(Phone).Append("\n"); - sb.Append(" UserStatus: ").Append(UserStatus).Append("\n"); - sb.Append("}\n"); - return sb.ToString(); - } - - /// - /// Returns the JSON string presentation of the object - /// - /// JSON string presentation of the object - public string ToJson() - { - return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented); - } - - /// - /// Returns true if objects are equal - /// - /// Object to be compared - /// Boolean - public override bool Equals(object obj) - { - if (obj is null) return false; - if (ReferenceEquals(this, obj)) return true; - return obj.GetType() == GetType() && Equals((User)obj); - } - - /// - /// Returns true if User instances are equal - /// - /// Instance of User to be compared - /// Boolean - public bool Equals(User other) - { - if (other is null) return false; - if (ReferenceEquals(this, other)) return true; - - return - ( - Id == other.Id || - - Id.Equals(other.Id) - ) && - ( - Username == other.Username || - Username != null && - Username.Equals(other.Username) - ) && - ( - FirstName == other.FirstName || - FirstName != null && - FirstName.Equals(other.FirstName) - ) && - ( - LastName == other.LastName || - LastName != null && - LastName.Equals(other.LastName) - ) && - ( - Email == other.Email || - Email != null && - Email.Equals(other.Email) - ) && - ( - Password == other.Password || - Password != null && - Password.Equals(other.Password) - ) && - ( - Phone == other.Phone || - Phone != null && - Phone.Equals(other.Phone) - ) && - ( - UserStatus == other.UserStatus || - - UserStatus.Equals(other.UserStatus) - ); - } - - /// - /// Gets the hash code - /// - /// Hash code - public override int GetHashCode() - { - unchecked // Overflow is fine, just wrap - { - var hashCode = 41; - // Suitable nullity checks etc, of course :) - - hashCode = hashCode * 59 + Id.GetHashCode(); - if (Username != null) - hashCode = hashCode * 59 + Username.GetHashCode(); - if (FirstName != null) - hashCode = hashCode * 59 + FirstName.GetHashCode(); - if (LastName != null) - hashCode = hashCode * 59 + LastName.GetHashCode(); - if (Email != null) - hashCode = hashCode * 59 + Email.GetHashCode(); - if (Password != null) - hashCode = hashCode * 59 + Password.GetHashCode(); - if (Phone != null) - hashCode = hashCode * 59 + Phone.GetHashCode(); - - hashCode = hashCode * 59 + UserStatus.GetHashCode(); - return hashCode; - } - } - - #region Operators - #pragma warning disable 1591 - - public static bool operator ==(User left, User right) - { - return Equals(left, right); - } - - public static bool operator !=(User left, User right) - { - return !Equals(left, right); - } - - #pragma warning restore 1591 - #endregion Operators - } -} diff --git a/samples/server/petstore/aspnetcore-6.0-useNewtonsoft/src/Org.OpenAPITools/Models/Order.cs b/samples/server/petstore/aspnetcore-6.0-useNewtonsoft/src/Org.OpenAPITools/Models/Order.cs index b7385cfe794..cbf41566ae1 100644 --- a/samples/server/petstore/aspnetcore-6.0-useNewtonsoft/src/Org.OpenAPITools/Models/Order.cs +++ b/samples/server/petstore/aspnetcore-6.0-useNewtonsoft/src/Org.OpenAPITools/Models/Order.cs @@ -47,7 +47,7 @@ namespace Org.OpenAPITools.Models /// /// Gets or Sets ShipDate /// - [DataMember(Name="shipDate", EmitDefaultValue=false)] + [DataMember(Name="shipDate", EmitDefaultValue=true)] public DateTime ShipDate { get; set; } @@ -163,7 +163,7 @@ namespace Org.OpenAPITools.Models ) && ( ShipDate == other.ShipDate || - ShipDate != null && + ShipDate.Equals(other.ShipDate) ) && ( @@ -194,7 +194,7 @@ namespace Org.OpenAPITools.Models hashCode = hashCode * 59 + PetId.GetHashCode(); hashCode = hashCode * 59 + Quantity.GetHashCode(); - if (ShipDate != null) + hashCode = hashCode * 59 + ShipDate.GetHashCode(); hashCode = hashCode * 59 + Status.GetHashCode(); diff --git a/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/Order.cs b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/Order.cs index 8b2c83a9c01..5b3d6c1aaac 100644 --- a/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/Order.cs +++ b/samples/server/petstore/aspnetcore-6.0-useSwashBuckle/src/Org.OpenAPITools/Models/Order.cs @@ -47,7 +47,7 @@ namespace Org.OpenAPITools.Models /// /// Gets or Sets ShipDate /// - [DataMember(Name="shipDate", EmitDefaultValue=false)] + [DataMember(Name="shipDate", EmitDefaultValue=true)] public DateTime ShipDate { get; set; } @@ -159,7 +159,7 @@ namespace Org.OpenAPITools.Models ) && ( ShipDate == other.ShipDate || - ShipDate != null && + ShipDate.Equals(other.ShipDate) ) && ( @@ -190,7 +190,7 @@ namespace Org.OpenAPITools.Models hashCode = hashCode * 59 + PetId.GetHashCode(); hashCode = hashCode * 59 + Quantity.GetHashCode(); - if (ShipDate != null) + hashCode = hashCode * 59 + ShipDate.GetHashCode(); hashCode = hashCode * 59 + Status.GetHashCode(); diff --git a/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Models/Order.cs b/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Models/Order.cs index 5da36e6f1fd..5076e34732a 100644 --- a/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Models/Order.cs +++ b/samples/server/petstore/aspnetcore-6.0/src/Org.OpenAPITools/Models/Order.cs @@ -47,7 +47,7 @@ namespace Org.OpenAPITools.Models /// /// Gets or Sets ShipDate /// - [DataMember(Name="shipDate", EmitDefaultValue=false)] + [DataMember(Name="shipDate", EmitDefaultValue=true)] public DateTime ShipDate { get; set; } @@ -159,7 +159,7 @@ namespace Org.OpenAPITools.Models ) && ( ShipDate == other.ShipDate || - ShipDate != null && + ShipDate.Equals(other.ShipDate) ) && ( @@ -190,7 +190,7 @@ namespace Org.OpenAPITools.Models hashCode = hashCode * 59 + PetId.GetHashCode(); hashCode = hashCode * 59 + Quantity.GetHashCode(); - if (ShipDate != null) + hashCode = hashCode * 59 + ShipDate.GetHashCode(); hashCode = hashCode * 59 + Status.GetHashCode(); diff --git a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Order.cs b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Order.cs index e9013f0ed0d..c570b90ac84 100644 --- a/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Order.cs +++ b/samples/server/petstore/aspnetcore/src/Org.OpenAPITools/Models/Order.cs @@ -159,7 +159,7 @@ namespace Org.OpenAPITools.Models ) && ( ShipDate == other.ShipDate || - ShipDate != null && + ShipDate.Equals(other.ShipDate) ) && ( @@ -190,7 +190,7 @@ namespace Org.OpenAPITools.Models hashCode = hashCode * 59 + PetId.GetHashCode(); hashCode = hashCode * 59 + Quantity.GetHashCode(); - if (ShipDate != null) + hashCode = hashCode * 59 + ShipDate.GetHashCode(); hashCode = hashCode * 59 + Status.GetHashCode();