added equatable option (#16106)

docs/generators/csharp.md

@@ -25,6 +25,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |dateFormat|The default Date format (only `generichost` library supports this option).| |yyyy'-'MM'-'dd|
 |dateTimeFormat|The default DateTime format (only `generichost` library supports this option).| |yyyy'-'MM'-'dd'T'HH':'mm':'ss'.'fffffffK|
 |disallowAdditionalPropertiesIfNotPresent|If false, the 'additionalProperties' implementation (set to true by default) is compliant with the OAS and JSON schema specifications. If true (default), keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.|<dl><dt>**false**</dt><dd>The 'additionalProperties' implementation is compliant with the OAS and JSON schema specifications.</dd><dt>**true**</dt><dd>Keep the old (incorrect) behaviour that 'additionalProperties' is set to false by default.</dd></dl>|true|
+|equatable|Overrides Equals and GetHashCode methods.| |true|
 |hideGenerationTimestamp|Hides the generation timestamp when files are generated.| |true|
 |interfacePrefix|Prefix interfaces with a community standard or widely accepted prefix.| |I|
 |library|HTTP library template (sub-template) to use|<dl><dt>**generichost**</dt><dd>HttpClient with Generic Host dependency injection (https://docs.microsoft.com/en-us/dotnet/core/extensions/generic-host) (Experimental. Subject to breaking changes without notice.)</dd><dt>**httpclient**</dt><dd>HttpClient (https://docs.microsoft.com/en-us/dotnet/api/system.net.http.httpclient) (Experimental. Subject to breaking changes without notice.)</dd><dt>**unityWebRequest**</dt><dd>UnityWebRequest (...) (Experimental. Subject to breaking changes without notice.)</dd><dt>**restsharp**</dt><dd>RestSharp (https://github.com/restsharp/RestSharp)</dd></dl>|restsharp|

modules/openapi-generator/src/main/java/org/openapitools/codegen/CodegenConstants.java

@@ -320,6 +320,9 @@ public class CodegenConstants {
     public static final String VALIDATABLE = "validatable";
     public static final String VALIDATABLE_DESC = "Generates self-validatable models.";
 
+    public static final String EQUATABLE = "equatable";
+    public static final String EQUATABLE_DESC = "Overrides Equals and GetHashCode methods.";
+
     public static final String IGNORE_FILE_OVERRIDE = "ignoreFileOverride";
     public static final String IGNORE_FILE_OVERRIDE_DESC = "Specifies an override location for the .openapi-generator-ignore file. Most useful on initial generation.";
 

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/AbstractCSharpCodegen.java

@@ -416,7 +416,8 @@ public abstract class AbstractCSharpCodegen extends DefaultCodegen implements Co
                 .put("joinWithComma", new JoinWithCommaLambda())
                 .put("trimLineBreaks", new TrimLineBreaksLambda())
                 .put("trimTrailingWhiteSpace", new TrimTrailingWhiteSpaceLambda())
-                .put("first", new FirstLambda())
+                .put("first", new FirstLambda("  "))
+                .put("firstDot", new FirstLambda("\\."))
                 .put("indent3", new IndentedLambda(12, " "))
                 .put("indent4", new IndentedLambda(16, " "));
     }

modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/CSharpClientCodegen.java

@@ -114,6 +114,7 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
     protected boolean supportsFileParameters = Boolean.TRUE;
 
     protected boolean validatable = Boolean.TRUE;
+    protected boolean equatable = Boolean.TRUE;
     protected Map<Character, String> regexModifiers;
     // By default, generated code is considered public
     protected boolean nonPublicApi = Boolean.FALSE;
@@ -318,6 +319,10 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
                 CodegenConstants.CASE_INSENSITIVE_RESPONSE_HEADERS_DESC,
                 this.caseInsensitiveResponseHeaders);
 
+        addSwitch(CodegenConstants.EQUATABLE,
+                CodegenConstants.EQUATABLE_DESC,
+                this.equatable);
+
         regexModifiers = new HashMap<>();
         regexModifiers.put('i', "IgnoreCase");
         regexModifiers.put('m', "Multiline");
@@ -820,6 +825,7 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
 
         syncBooleanProperty(additionalProperties, "netStandard", this::setNetStandard, this.netStandard);
 
+        syncBooleanProperty(additionalProperties, CodegenConstants.EQUATABLE, this::setEquatable, this.equatable);
         syncBooleanProperty(additionalProperties, CodegenConstants.VALIDATABLE, this::setValidatable, this.validatable);
         syncBooleanProperty(additionalProperties, CodegenConstants.SUPPORTS_ASYNC, this::setSupportsAsync, this.supportsAsync);
         syncBooleanProperty(additionalProperties, SUPPORTS_RETRY, this::setSupportsRetry, this.supportsRetry);
@@ -1183,6 +1189,10 @@ public class CSharpClientCodegen extends AbstractCSharpCodegen {
         this.validatable = validatable;
     }
 
+    public void setEquatable(boolean equatable) {
+        this.equatable = equatable;
+    }
+
     public void setCaseInsensitiveResponseHeaders(final Boolean caseInsensitiveResponseHeaders) {
         this.caseInsensitiveResponseHeaders = caseInsensitiveResponseHeaders;
     }

modules/openapi-generator/src/main/java/org/openapitools/codegen/templating/mustache/FirstLambda.java

@@ -37,13 +37,19 @@ import java.util.Arrays;
  * </pre>
  */
 public class FirstLambda implements Mustache.Lambda {
-    public FirstLambda() {
+    private final String delimiter;
 
+    public FirstLambda(String delimiter) {
+        this.delimiter = delimiter;
     }
 
     @Override
     public void execute(Template.Fragment fragment, Writer writer) throws IOException {
-        String[] parts = fragment.execute().trim().split("  ");
+
+        String a = fragment.execute();
+
+
+        String[] parts = fragment.execute().split(this.delimiter);
 
         writer.write(Arrays.stream(parts).findFirst().orElse(""));
     }

modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ImplementsIEquatable.mustache

@@ -1,3 +1 @@
-{{#readOnlyVars}}
+{{#equatable}}{{#readOnlyVars}}{{#-first}}IEquatable<{{classname}}{{nrt?}}>  {{/-first}}{{/readOnlyVars}}{{/equatable}}
-{{#-first}}
-{{#parent}}, {{/parent}}{{^parent}} : {{/parent}}IEquatable<{{classname}}{{nrt?}}>{{/-first}}{{/readOnlyVars}}

modules/openapi-generator/src/main/resources/csharp/libraries/generichost/ImplementsValidatable.mustache

@@ -1,4 +1 @@
-{{#validatable}}
+{{#validatable}}IValidatableObject  {{/validatable}}
-{{^parent}}
-{{^readOnlyVars}}
- : {{/readOnlyVars}}{{/parent}}{{#parent}}{{^readOnlyVars}}, {{/readOnlyVars}}{{/parent}}{{^parent}}{{#readOnlyVars}}{{#-first}}, {{/-first}}{{/readOnlyVars}}{{/parent}}IValidatableObject{{/validatable}}

modules/openapi-generator/src/main/resources/csharp/libraries/generichost/modelGeneric.mustache

@@ -1,7 +1,7 @@
     /// <summary>
     /// {{description}}{{^description}}{{classname}}{{/description}}
     /// </summary>
-    {{>visibility}} partial class {{classname}}{{#parent}} : {{{.}}}{{/parent}}{{>ImplementsIEquatable}}{{>ImplementsValidatable}}
+    {{>visibility}} partial class {{classname}}{{#lambda.firstDot}}{{#parent}} : .{{/parent}}{{#validatable}} : .{{/validatable}}{{#equatable}} : .{{/equatable}}{{/lambda.firstDot}}{{#lambda.joinWithComma}}{{#parent}}{{{.}}}  {{/parent}}{{>ImplementsIEquatable}}{{#validatable}}IValidatableObject  {{/validatable}}{{/lambda.joinWithComma}}
     {
         {{#composedSchemas.oneOf}}
         {{^vendorExtensions.x-duplicated-data-type}}
@@ -200,6 +200,7 @@
             sb.Append("}\n");
             return sb.ToString();
         }
+        {{#equatable}}
         {{#readOnlyVars}}
         {{#-first}}
 
@@ -294,6 +295,7 @@
         }
         {{/-first}}
         {{/readOnlyVars}}
+        {{/equatable}}
 {{#validatable}}
 {{^parentModel}}
 

modules/openapi-generator/src/main/resources/csharp/modelAnyOf.mustache

@@ -10,7 +10,7 @@
     {{/vendorExtensions.x-com-visible}}
     [JsonConverter(typeof({{classname}}JsonConverter))]
     [DataContract(Name = "{{{name}}}")]
-    {{>visibility}} partial class {{classname}} : AbstractOpenAPISchema, {{#parent}}{{{.}}}, {{/parent}}IEquatable<{{classname}}>{{#validatable}}, IValidatableObject{{/validatable}}
+    {{>visibility}} partial class {{classname}} : AbstractOpenAPISchema, {{#lambda.joinWithComma}}{{#parent}}{{{.}}}  {{/parent}}{{#equatable}}IEquatable<{{classname}}>  {{/equatable}}{{#validatable}}IValidatableObject  {{/validatable}}{{/lambda.joinWithComma}}
     {
         {{#isNullable}}
         /// <summary>
@@ -137,6 +137,7 @@
             // no match found, throw an exception
             throw new InvalidDataException("The JSON string `" + jsonString + "` cannot be deserialized into any schema defined.");
         }
+        {{#equatable}}
 
         /// <summary>
         /// Returns true if objects are equal
@@ -185,6 +186,7 @@
                 return hashCode;
             }
         }
+        {{/equatable}}
 
         {{#validatable}}
         /// <summary>

modules/openapi-generator/src/main/resources/csharp/modelGeneric.mustache

@@ -16,7 +16,7 @@
     {{/mappedModels}}
     {{/discriminator}}
     {{/useUnityWebRequest}}
-    {{>visibility}} partial class {{classname}} : {{#parent}}{{{.}}}, {{/parent}}IEquatable<{{classname}}>{{#validatable}}, IValidatableObject{{/validatable}}
+    {{>visibility}} partial class {{classname}}{{#lambda.firstDot}}{{#parent}} : .{{/parent}}{{#validatable}} : .{{/validatable}}{{#equatable}} : .{{/equatable}}{{/lambda.firstDot}}{{#lambda.joinWithComma}}{{#parent}}{{{.}}}  {{/parent}}{{#equatable}}IEquatable<{{classname}}>  {{/equatable}}{{#validatable}}IValidatableObject  {{/validatable}}{{/lambda.joinWithComma}}
     {
         {{#vars}}
         {{#items.isEnum}}
@@ -327,6 +327,7 @@
         {
             return Newtonsoft.Json.JsonConvert.SerializeObject(this, Newtonsoft.Json.Formatting.Indented);
         }
+        {{#equatable}}
 
         /// <summary>
         /// Returns true if objects are equal
@@ -415,6 +416,7 @@
                 return hashCode;
             }
         }
+        {{/equatable}}
 
 {{#validatable}}
 {{>validatable}}

modules/openapi-generator/src/main/resources/csharp/modelOneOf.mustache

@@ -10,7 +10,7 @@
     {{/vendorExtensions.x-com-visible}}
     [JsonConverter(typeof({{classname}}JsonConverter))]
     [DataContract(Name = "{{{name}}}")]
-    {{>visibility}} partial class {{classname}} : AbstractOpenAPISchema, {{#parent}}{{{.}}}, {{/parent}}IEquatable<{{classname}}>{{#validatable}}, IValidatableObject{{/validatable}}
+    {{>visibility}} partial class {{classname}} : {{#lambda.joinWithComma}}AbstractOpenAPISchema  {{#parent}}{{{.}}}  {{/parent}}{{#equatable}}IEquatable<{{classname}}>  {{/equatable}}{{#validatable}}IValidatableObject  {{/validatable}}{{/lambda.joinWithComma}}
     {
         {{#isNullable}}
         /// <summary>
@@ -183,6 +183,7 @@
             return new{{classname}};
         }
 
+        {{#equatable}}
         /// <summary>
         /// Returns true if objects are equal
         /// </summary>
@@ -230,8 +231,9 @@
                 return hashCode;
             }
         }
-
+        {{/equatable}}
         {{#validatable}}
+
         /// <summary>
         /// To validate all properties of the instance
         /// </summary>

samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Fruit.cs

@@ -233,7 +233,6 @@ namespace Org.OpenAPITools.Model
                 return hashCode;
             }
         }
-
     }
 
     /// <summary>

samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/FruitReq.cs

@@ -242,7 +242,6 @@ namespace Org.OpenAPITools.Model
                 return hashCode;
             }
         }
-
     }
 
     /// <summary>

samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Mammal.cs

@@ -279,7 +279,6 @@ namespace Org.OpenAPITools.Model
                 return hashCode;
             }
         }
-
     }
 
     /// <summary>

samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/NullableShape.cs

@@ -242,7 +242,6 @@ namespace Org.OpenAPITools.Model
                 return hashCode;
             }
         }
-
     }
 
     /// <summary>

samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/OneOfString.cs

@@ -187,7 +187,6 @@ namespace Org.OpenAPITools.Model
                 return hashCode;
             }
         }
-
     }
 
     /// <summary>

samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Pig.cs

@@ -233,7 +233,6 @@ namespace Org.OpenAPITools.Model
                 return hashCode;
             }
         }
-
     }
 
     /// <summary>

samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/PolymorphicProperty.cs

@@ -325,7 +325,6 @@ namespace Org.OpenAPITools.Model
                 return hashCode;
             }
         }
-
     }
 
     /// <summary>

samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Quadrilateral.cs

@@ -233,7 +233,6 @@ namespace Org.OpenAPITools.Model
                 return hashCode;
             }
         }
-
     }
 
     /// <summary>

samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Shape.cs

@@ -233,7 +233,6 @@ namespace Org.OpenAPITools.Model
                 return hashCode;
             }
         }
-
     }
 
     /// <summary>

samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/ShapeOrNull.cs

@@ -242,7 +242,6 @@ namespace Org.OpenAPITools.Model
                 return hashCode;
             }
         }
-
     }
 
     /// <summary>

samples/client/petstore/csharp/OpenAPIClient-unityWebRequest/src/Org.OpenAPITools/Model/Triangle.cs

@@ -279,7 +279,6 @@ namespace Org.OpenAPITools.Model
                 return hashCode;
             }
         }
-
     }
 
     /// <summary>