[dart-dio] Incorrect hashCode and == overide for fields withList (#18198)

* [dart-dio] Incorrect hashCode and == overide for fields withList

* fix

* extend description

---------

Co-authored-by: Vasiliy Ditsyak <vasilich6107@users.noreply.github.com>

docs/generators/dart-dio.md

@@ -23,6 +23,7 @@ These options may be applied as additional-properties (cli) or configOptions (pl
 |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|
 |ensureUniqueParams|Whether to ensure parameter names are unique in an operation (rename parameters that are not).| |true|
 |enumUnknownDefaultCase|If the server adds new enum cases, that are unknown by an old spec/client, the client will fail to parse the network response.With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the server sends an enum case that is not known by the client/spec, they can safely fallback to this case.|<dl><dt>**false**</dt><dd>No changes to the enum's are made, this is the default option.</dd><dt>**true**</dt><dd>With this option enabled, each enum will have a new case, 'unknown_default_open_api', so that when the enum case sent by the server is not known by the client/spec, can safely be decoded to this case.</dd></dl>|false|
+|equalityCheckMethod|Specify equality check method. Takes effect only in case if serializationLibrary is json_serializable.|<dl><dt>**default**</dt><dd>[DEFAULT] Built in hash code generation method</dd><dt>**equatable**</dt><dd>Uses equatable library for equality checking</dd></dl>|default|
 |finalProperties|Whether properties are marked as final when using Json Serializable for serialization| |true|
 |legacyDiscriminatorBehavior|Set to false for generators with better support for discriminators. (Python, Java, Go, PowerShell, C# have this enabled by default).|<dl><dt>**true**</dt><dd>The mapping in the discriminator includes descendent schemas that allOf inherit from self and the discriminator mapping schemas in the OAS document.</dd><dt>**false**</dt><dd>The mapping in the discriminator includes any descendent schemas that allOf inherit from self, any oneOf schemas, any anyOf schemas, any x-discriminator-values, and the discriminator mapping schemas in the OAS document AND Codegen validates that oneOf and anyOf schemas contain the required discriminator and throws an error if the discriminator is missing.</dd></dl>|true|
 |prependFormOrBodyParameters|Add form or body parameters to the beginning of the parameter list.| |false|

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

@@ -60,6 +60,9 @@ public class DartDioClientCodegen extends AbstractDartCodegen {
     public static final String DATE_LIBRARY_TIME_MACHINE = "timemachine";
     public static final String DATE_LIBRARY_DEFAULT = DATE_LIBRARY_CORE;
 
+    public static final String EQUALITY_CHECK_METHOD = "equalityCheckMethod";
+    public static final String EQUALITY_CHECK_METHOD_DEFAULT = "default";
+    public static final String EQUALITY_CHECK_METHOD_EQUATABLE = "equatable";
     public static final String SERIALIZATION_LIBRARY_BUILT_VALUE = "built_value";
     public static final String SERIALIZATION_LIBRARY_JSON_SERIALIZABLE = "json_serializable";
     public static final String SERIALIZATION_LIBRARY_DEFAULT = SERIALIZATION_LIBRARY_BUILT_VALUE;
@@ -71,6 +74,7 @@ public class DartDioClientCodegen extends AbstractDartCodegen {
     private static final String CLIENT_NAME = "clientName";
 
     private String dateLibrary;
+    private String equalityCheckMethod;
 
     private String clientName;
 
@@ -107,19 +111,30 @@ public class DartDioClientCodegen extends AbstractDartCodegen {
         serializationLibrary.setDefault(SERIALIZATION_LIBRARY_DEFAULT);
         cliOptions.add(serializationLibrary);
 
+        // Equality check option
+        final CliOption equalityCheckOption = CliOption.newString(EQUALITY_CHECK_METHOD, "Specify equality check method. Takes effect only in case if serializationLibrary is json_serializable.");
+        equalityCheckOption.setDefault(EQUALITY_CHECK_METHOD_DEFAULT);
+
+        final Map<String, String> equalityCheckOptions = new HashMap<>();
+        equalityCheckOptions.put(EQUALITY_CHECK_METHOD_DEFAULT, "[DEFAULT] Built in hash code generation method");
+        equalityCheckOptions.put(EQUALITY_CHECK_METHOD_EQUATABLE, "Uses equatable library for equality checking");
+        equalityCheckOption.setEnum(equalityCheckOptions);
+        cliOptions.add(equalityCheckOption);
+
         // Date Library Option
         final CliOption dateOption = CliOption.newString(DATE_LIBRARY, "Specify Date library");
         dateOption.setDefault(DATE_LIBRARY_DEFAULT);
 
-        final CliOption finalProperties = CliOption.newBoolean(FINAL_PROPERTIES, "Whether properties are marked as final when using Json Serializable for serialization");
-        finalProperties.setDefault("true");
-        cliOptions.add(finalProperties);
-
         final Map<String, String> dateOptions = new HashMap<>();
         dateOptions.put(DATE_LIBRARY_CORE, "[DEFAULT] Dart core library (DateTime)");
         dateOptions.put(DATE_LIBRARY_TIME_MACHINE, "Time Machine is date and time library for Flutter, Web, and Server with support for timezones, calendars, cultures, formatting and parsing.");
         dateOption.setEnum(dateOptions);
         cliOptions.add(dateOption);
+
+        // Final Properties Option
+        final CliOption finalProperties = CliOption.newBoolean(FINAL_PROPERTIES, "Whether properties are marked as final when using Json Serializable for serialization");
+        finalProperties.setDefault("true");
+        cliOptions.add(finalProperties);
     }
 
     public String getDateLibrary() {
@@ -130,6 +145,14 @@ public class DartDioClientCodegen extends AbstractDartCodegen {
         this.dateLibrary = library;
     }
 
+    public String getEqualityCheckMethod() {
+        return equalityCheckMethod;
+    }
+
+    public void setEqualityCheckMethod(String equalityCheckMethod) {
+        this.equalityCheckMethod = equalityCheckMethod;
+    }
+
     public String getClientName() {
         return clientName;
     }
@@ -172,6 +195,12 @@ public class DartDioClientCodegen extends AbstractDartCodegen {
         }
         setDateLibrary(additionalProperties.get(DATE_LIBRARY).toString());
 
+        if (!additionalProperties.containsKey(EQUALITY_CHECK_METHOD)) {
+            additionalProperties.put(EQUALITY_CHECK_METHOD, EQUALITY_CHECK_METHOD_DEFAULT);
+            LOGGER.debug("Equality check method not set, using default {}", EQUALITY_CHECK_METHOD_DEFAULT);
+        }
+        setEqualityCheckMethod(additionalProperties.get(EQUALITY_CHECK_METHOD).toString());
+
         if (!additionalProperties.containsKey(FINAL_PROPERTIES)) {
             additionalProperties.put(FINAL_PROPERTIES, Boolean.parseBoolean(FINAL_PROPERTIES_DEFAULT_VALUE));
             LOGGER.debug("finalProperties not set, using default {}", FINAL_PROPERTIES_DEFAULT_VALUE);
@@ -205,6 +234,7 @@ public class DartDioClientCodegen extends AbstractDartCodegen {
         supportingFiles.add(new SupportingFile("auth/auth.mustache", authFolder, "auth.dart"));
 
         configureSerializationLibrary(srcFolder);
+        configureEqualityCheckMethod(srcFolder);
         configureDateLibrary(srcFolder);
     }
 
@@ -278,6 +308,17 @@ public class DartDioClientCodegen extends AbstractDartCodegen {
         imports.put("MultipartFile", DIO_IMPORT);
     }
 
+    private void configureEqualityCheckMethod(String srcFolder) {
+        switch (equalityCheckMethod) {
+            case EQUALITY_CHECK_METHOD_EQUATABLE:
+                additionalProperties.put("useEquatable", "true");
+                break;
+            default:
+            case EQUALITY_CHECK_METHOD_DEFAULT:
+                break;
+        }
+    }
+
     private void configureDateLibrary(String srcFolder) {
         switch (dateLibrary) {
             case DATE_LIBRARY_TIME_MACHINE:

modules/openapi-generator/src/main/resources/dart/libraries/dio/pubspec.mustache

@@ -20,6 +20,9 @@ dependencies:
   built_value: '>=8.4.0 <9.0.0'
   built_collection: '>=5.1.1 <6.0.0'
 {{/useBuiltValue}}
+{{#useEquatable}}
+  equatable: '^2.0.5'
+{{/useEquatable}}
 {{#useJsonSerializable}}
   json_annotation: '^4.4.0'
 {{/useJsonSerializable}}

modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/json_serializable/class.mustache

@@ -1,4 +1,7 @@
 import 'package:json_annotation/json_annotation.dart';
+{{#useEquatable}}
+import 'package:equatable/src/equatable_utils.dart';
+{{/useEquatable}}
 
 part '{{classFilename}}.g.dart';
 
@@ -61,17 +64,50 @@ class {{{classname}}} {
 
 
 {{/vars}}
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is {{{classname}}} &&
-  {{#vars}}
-     other.{{{name}}} == {{{name}}}{{^-last}} &&{{/-last}}{{#-last}};{{/-last}}
-  {{/vars}}
 
-  @override
+  {{#useEquatable}}
-  int get hashCode =>
+    bool operator ==(Object other) {
-  {{#vars}}
+      return identical(this, other) ||
-    {{#isNullable}}({{{name}}} == null ? 0 : {{{name}}}.hashCode){{/isNullable}}{{^isNullable}}{{{name}}}.hashCode{{/isNullable}}{{^-last}} +{{/-last}}{{#-last}};{{/-last}}
+      other is {{{classname}}} &&
-  {{/vars}}
+      runtimeType == other.runtimeType &&
+      equals(
+        [
+          {{#vars}}
+            {{{name}}},
+          {{/vars}}
+        ],
+        [
+          {{#vars}}
+            other.{{{name}}},
+          {{/vars}}
+        ]
+      );
+    }
+  {{/useEquatable}}
+
+  {{^useEquatable}}
+    @override
+    bool operator ==(Object other) => identical(this, other) || other is {{{classname}}} &&
+    {{#vars}}
+      other.{{{name}}} == {{{name}}}{{^-last}} &&{{/-last}}{{#-last}};{{/-last}}
+    {{/vars}}
+  {{/useEquatable}}
+
+  {{#useEquatable}}
+    @override
+    int get hashCode => runtimeType.hashCode ^ mapPropsToHashCode([
+    {{#vars}}
+        {{{name}}},
+    {{/vars}}
+    ],);
+  {{/useEquatable}}
+  {{^useEquatable}}
+    @override
+    int get hashCode =>
+    {{#vars}}
+        {{#isNullable}}({{{name}}} == null ? 0 : {{{name}}}.hashCode){{/isNullable}}{{^isNullable}}{{{name}}}.hashCode{{/isNullable}}{{^-last}} +{{/-last}}{{#-last}};{{/-last}}
+    {{/vars}}
+  {{/useEquatable}}
 
   factory {{{classname}}}.fromJson(Map<String, dynamic> json) => _${{{classname}}}FromJson(json);
 

modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/json_serializable/enum.mustache

@@ -7,11 +7,13 @@ import 'package:json_annotation/json_annotation.dart';
 enum {{{classname}}} {
 {{#allowableValues}}
 {{#enumVars}}
-  {{#description}}
+  {{^isNull}}
-  /// {{{.}}}
+      {{#description}}
-  {{/description}}
+          /// {{{.}}}
-  @JsonValue({{#isString}}r{{/isString}}{{{value}}})
+      {{/description}}
-  {{{name}}}({{^isString}}'{{/isString}}{{#isString}}r{{/isString}}{{{value}}}{{^isString}}'{{/isString}}){{^-last}},{{/-last}}{{#-last}};{{/-last}}
+      @JsonValue({{#isString}}r{{/isString}}{{{value}}})
+      {{{name}}}({{^isString}}'{{/isString}}{{#isString}}r{{/isString}}{{{value}}}{{^isString}}'{{/isString}}){{^-last}},{{/-last}}{{#-last}};{{/-last}}
+  {{/isNull}}
 {{/enumVars}}
 {{/allowableValues}}
 

modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/DartClientOptionsTest.java

@@ -20,6 +20,7 @@ package org.openapitools.codegen.dart;
 import org.openapitools.codegen.AbstractOptionsTest;
 import org.openapitools.codegen.CodegenConfig;
 import org.openapitools.codegen.languages.DartClientCodegen;
+import org.openapitools.codegen.languages.DartDioClientCodegen;
 import org.openapitools.codegen.options.DartClientOptionsProvider;
 
 import static org.mockito.Mockito.mock;

modules/openapi-generator/src/test/java/org/openapitools/codegen/dart/dio/DartDioClientOptionsTest.java

@@ -53,6 +53,7 @@ public class DartDioClientOptionsTest extends AbstractOptionsTest {
         verify(clientCodegen).setUseEnumExtension(Boolean.parseBoolean(DartDioClientOptionsProvider.USE_ENUM_EXTENSION));
         verify(clientCodegen).setDateLibrary(DartDioClientCodegen.DATE_LIBRARY_DEFAULT);
         verify(clientCodegen).setLibrary(DartDioClientCodegen.SERIALIZATION_LIBRARY_DEFAULT);
+        verify(clientCodegen).setEqualityCheckMethod(DartDioClientCodegen.EQUALITY_CHECK_METHOD_DEFAULT);
         verify(clientCodegen).setEnumUnknownDefaultCase(Boolean.parseBoolean(DartDioClientOptionsProvider.ENUM_UNKNOWN_DEFAULT_CASE_VALUE));
     }
 }

modules/openapi-generator/src/test/java/org/openapitools/codegen/options/DartDioClientOptionsProvider.java

@@ -64,6 +64,7 @@ public class DartDioClientOptionsProvider implements OptionsProvider {
                 .put(CodegenConstants.SERIALIZATION_LIBRARY, DartDioClientCodegen.SERIALIZATION_LIBRARY_DEFAULT)
                 .put(DartDioClientCodegen.DATE_LIBRARY, DartDioClientCodegen.DATE_LIBRARY_DEFAULT)
                 .put(DartDioClientCodegen.FINAL_PROPERTIES, DartDioClientCodegen.FINAL_PROPERTIES_DEFAULT_VALUE)
+                .put(DartDioClientCodegen.EQUALITY_CHECK_METHOD, DartDioClientCodegen.EQUALITY_CHECK_METHOD_DEFAULT)
                 .put(CodegenConstants.SOURCE_FOLDER, SOURCE_FOLDER_VALUE)
                 .put(DartDioClientCodegen.USE_ENUM_EXTENSION, USE_ENUM_EXTENSION)
                 .put(CodegenConstants.ALLOW_UNICODE_IDENTIFIERS, ALLOW_UNICODE_IDENTIFIERS_VALUE)

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/additional_properties_class.dart

@@ -47,15 +47,17 @@ class AdditionalPropertiesClass {
 
 
 
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is AdditionalPropertiesClass &&
-     other.mapProperty == mapProperty &&
-     other.mapOfMapProperty == mapOfMapProperty;
 
-  @override
+
-  int get hashCode =>
+    @override
-    mapProperty.hashCode +
+    bool operator ==(Object other) => identical(this, other) || other is AdditionalPropertiesClass &&
-    mapOfMapProperty.hashCode;
+      other.mapProperty == mapProperty &&
+      other.mapOfMapProperty == mapOfMapProperty;
+
+    @override
+    int get hashCode =>
+        mapProperty.hashCode +
+        mapOfMapProperty.hashCode;
 
   factory AdditionalPropertiesClass.fromJson(Map<String, dynamic> json) => _$AdditionalPropertiesClassFromJson(json);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/all_of_with_single_ref.dart

@@ -48,15 +48,17 @@ class AllOfWithSingleRef {
 
 
 
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is AllOfWithSingleRef &&
-     other.username == username &&
-     other.singleRefType == singleRefType;
 
-  @override
+
-  int get hashCode =>
+    @override
-    username.hashCode +
+    bool operator ==(Object other) => identical(this, other) || other is AllOfWithSingleRef &&
-    singleRefType.hashCode;
+      other.username == username &&
+      other.singleRefType == singleRefType;
+
+    @override
+    int get hashCode =>
+        username.hashCode +
+        singleRefType.hashCode;
 
   factory AllOfWithSingleRef.fromJson(Map<String, dynamic> json) => _$AllOfWithSingleRefFromJson(json);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/animal.dart

@@ -47,15 +47,17 @@ class Animal {
 
 
 
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is Animal &&
-     other.className == className &&
-     other.color == color;
 
-  @override
+
-  int get hashCode =>
+    @override
-    className.hashCode +
+    bool operator ==(Object other) => identical(this, other) || other is Animal &&
-    color.hashCode;
+      other.className == className &&
+      other.color == color;
+
+    @override
+    int get hashCode =>
+        className.hashCode +
+        color.hashCode;
 
   factory Animal.fromJson(Map<String, dynamic> json) => _$AnimalFromJson(json);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/api_response.dart

@@ -61,17 +61,19 @@ class ApiResponse {
 
 
 
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is ApiResponse &&
-     other.code == code &&
-     other.type == type &&
-     other.message == message;
 
-  @override
+
-  int get hashCode =>
+    @override
-    code.hashCode +
+    bool operator ==(Object other) => identical(this, other) || other is ApiResponse &&
-    type.hashCode +
+      other.code == code &&
-    message.hashCode;
+      other.type == type &&
+      other.message == message;
+
+    @override
+    int get hashCode =>
+        code.hashCode +
+        type.hashCode +
+        message.hashCode;
 
   factory ApiResponse.fromJson(Map<String, dynamic> json) => _$ApiResponseFromJson(json);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/array_of_array_of_number_only.dart

@@ -33,13 +33,15 @@ class ArrayOfArrayOfNumberOnly {
 
 
 
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is ArrayOfArrayOfNumberOnly &&
-     other.arrayArrayNumber == arrayArrayNumber;
 
-  @override
+
-  int get hashCode =>
+    @override
-    arrayArrayNumber.hashCode;
+    bool operator ==(Object other) => identical(this, other) || other is ArrayOfArrayOfNumberOnly &&
+      other.arrayArrayNumber == arrayArrayNumber;
+
+    @override
+    int get hashCode =>
+        arrayArrayNumber.hashCode;
 
   factory ArrayOfArrayOfNumberOnly.fromJson(Map<String, dynamic> json) => _$ArrayOfArrayOfNumberOnlyFromJson(json);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/array_of_number_only.dart

@@ -33,13 +33,15 @@ class ArrayOfNumberOnly {
 
 
 
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is ArrayOfNumberOnly &&
-     other.arrayNumber == arrayNumber;
 
-  @override
+
-  int get hashCode =>
+    @override
-    arrayNumber.hashCode;
+    bool operator ==(Object other) => identical(this, other) || other is ArrayOfNumberOnly &&
+      other.arrayNumber == arrayNumber;
+
+    @override
+    int get hashCode =>
+        arrayNumber.hashCode;
 
   factory ArrayOfNumberOnly.fromJson(Map<String, dynamic> json) => _$ArrayOfNumberOnlyFromJson(json);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/array_test.dart

@@ -62,17 +62,19 @@ class ArrayTest {
 
 
 
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is ArrayTest &&
-     other.arrayOfString == arrayOfString &&
-     other.arrayArrayOfInteger == arrayArrayOfInteger &&
-     other.arrayArrayOfModel == arrayArrayOfModel;
 
-  @override
+
-  int get hashCode =>
+    @override
-    arrayOfString.hashCode +
+    bool operator ==(Object other) => identical(this, other) || other is ArrayTest &&
-    arrayArrayOfInteger.hashCode +
+      other.arrayOfString == arrayOfString &&
-    arrayArrayOfModel.hashCode;
+      other.arrayArrayOfInteger == arrayArrayOfInteger &&
+      other.arrayArrayOfModel == arrayArrayOfModel;
+
+    @override
+    int get hashCode =>
+        arrayOfString.hashCode +
+        arrayArrayOfInteger.hashCode +
+        arrayArrayOfModel.hashCode;
 
   factory ArrayTest.fromJson(Map<String, dynamic> json) => _$ArrayTestFromJson(json);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/capitalization.dart

@@ -104,23 +104,25 @@ class Capitalization {
 
 
 
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is Capitalization &&
-     other.smallCamel == smallCamel &&
-     other.capitalCamel == capitalCamel &&
-     other.smallSnake == smallSnake &&
-     other.capitalSnake == capitalSnake &&
-     other.sCAETHFlowPoints == sCAETHFlowPoints &&
-     other.ATT_NAME == ATT_NAME;
 
-  @override
+
-  int get hashCode =>
+    @override
-    smallCamel.hashCode +
+    bool operator ==(Object other) => identical(this, other) || other is Capitalization &&
-    capitalCamel.hashCode +
+      other.smallCamel == smallCamel &&
-    smallSnake.hashCode +
+      other.capitalCamel == capitalCamel &&
-    capitalSnake.hashCode +
+      other.smallSnake == smallSnake &&
-    sCAETHFlowPoints.hashCode +
+      other.capitalSnake == capitalSnake &&
-    ATT_NAME.hashCode;
+      other.sCAETHFlowPoints == sCAETHFlowPoints &&
+      other.ATT_NAME == ATT_NAME;
+
+    @override
+    int get hashCode =>
+        smallCamel.hashCode +
+        capitalCamel.hashCode +
+        smallSnake.hashCode +
+        capitalSnake.hashCode +
+        sCAETHFlowPoints.hashCode +
+        ATT_NAME.hashCode;
 
   factory Capitalization.fromJson(Map<String, dynamic> json) => _$CapitalizationFromJson(json);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/cat.dart

@@ -64,17 +64,19 @@ class Cat {
 
 
 
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is Cat &&
-     other.className == className &&
-     other.color == color &&
-     other.declawed == declawed;
 
-  @override
+
-  int get hashCode =>
+    @override
-    className.hashCode +
+    bool operator ==(Object other) => identical(this, other) || other is Cat &&
-    color.hashCode +
+      other.className == className &&
-    declawed.hashCode;
+      other.color == color &&
+      other.declawed == declawed;
+
+    @override
+    int get hashCode =>
+        className.hashCode +
+        color.hashCode +
+        declawed.hashCode;
 
   factory Cat.fromJson(Map<String, dynamic> json) => _$CatFromJson(json);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/category.dart

@@ -47,15 +47,17 @@ class Category {
 
 
 
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is Category &&
-     other.id == id &&
-     other.name == name;
 
-  @override
+
-  int get hashCode =>
+    @override
-    id.hashCode +
+    bool operator ==(Object other) => identical(this, other) || other is Category &&
-    name.hashCode;
+      other.id == id &&
+      other.name == name;
+
+    @override
+    int get hashCode =>
+        id.hashCode +
+        name.hashCode;
 
   factory Category.fromJson(Map<String, dynamic> json) => _$CategoryFromJson(json);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/child_with_nullable.dart

@@ -64,17 +64,19 @@ class ChildWithNullable {
 
 
 
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is ChildWithNullable &&
-     other.type == type &&
-     other.nullableProperty == nullableProperty &&
-     other.otherProperty == otherProperty;
 
-  @override
+
-  int get hashCode =>
+    @override
-    type.hashCode +
+    bool operator ==(Object other) => identical(this, other) || other is ChildWithNullable &&
-    (nullableProperty == null ? 0 : nullableProperty.hashCode) +
+      other.type == type &&
-    otherProperty.hashCode;
+      other.nullableProperty == nullableProperty &&
+      other.otherProperty == otherProperty;
+
+    @override
+    int get hashCode =>
+        type.hashCode +
+        (nullableProperty == null ? 0 : nullableProperty.hashCode) +
+        otherProperty.hashCode;
 
   factory ChildWithNullable.fromJson(Map<String, dynamic> json) => _$ChildWithNullableFromJson(json);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/class_model.dart

@@ -33,13 +33,15 @@ class ClassModel {
 
 
 
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is ClassModel &&
-     other.class_ == class_;
 
-  @override
+
-  int get hashCode =>
+    @override
-    class_.hashCode;
+    bool operator ==(Object other) => identical(this, other) || other is ClassModel &&
+      other.class_ == class_;
+
+    @override
+    int get hashCode =>
+        class_.hashCode;
 
   factory ClassModel.fromJson(Map<String, dynamic> json) => _$ClassModelFromJson(json);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/deprecated_object.dart

@@ -34,13 +34,15 @@ class DeprecatedObject {
 
 
 
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is DeprecatedObject &&
-     other.name == name;
 
-  @override
+
-  int get hashCode =>
+    @override
-    name.hashCode;
+    bool operator ==(Object other) => identical(this, other) || other is DeprecatedObject &&
+      other.name == name;
+
+    @override
+    int get hashCode =>
+        name.hashCode;
 
   factory DeprecatedObject.fromJson(Map<String, dynamic> json) => _$DeprecatedObjectFromJson(json);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/dog.dart

@@ -64,17 +64,19 @@ class Dog {
 
 
 
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is Dog &&
-     other.className == className &&
-     other.color == color &&
-     other.breed == breed;
 
-  @override
+
-  int get hashCode =>
+    @override
-    className.hashCode +
+    bool operator ==(Object other) => identical(this, other) || other is Dog &&
-    color.hashCode +
+      other.className == className &&
-    breed.hashCode;
+      other.color == color &&
+      other.breed == breed;
+
+    @override
+    int get hashCode =>
+        className.hashCode +
+        color.hashCode +
+        breed.hashCode;
 
   factory Dog.fromJson(Map<String, dynamic> json) => _$DogFromJson(json);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/enum_arrays.dart

@@ -47,15 +47,17 @@ class EnumArrays {
 
 
 
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is EnumArrays &&
-     other.justSymbol == justSymbol &&
-     other.arrayEnum == arrayEnum;
 
-  @override
+
-  int get hashCode =>
+    @override
-    justSymbol.hashCode +
+    bool operator ==(Object other) => identical(this, other) || other is EnumArrays &&
-    arrayEnum.hashCode;
+      other.justSymbol == justSymbol &&
+      other.arrayEnum == arrayEnum;
+
+    @override
+    int get hashCode =>
+        justSymbol.hashCode +
+        arrayEnum.hashCode;
 
   factory EnumArrays.fromJson(Map<String, dynamic> json) => _$EnumArraysFromJson(json);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/enum_test.dart

@@ -135,27 +135,29 @@ class EnumTest {
 
 
 
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is EnumTest &&
-     other.enumString == enumString &&
-     other.enumStringRequired == enumStringRequired &&
-     other.enumInteger == enumInteger &&
-     other.enumNumber == enumNumber &&
-     other.outerEnum == outerEnum &&
-     other.outerEnumInteger == outerEnumInteger &&
-     other.outerEnumDefaultValue == outerEnumDefaultValue &&
-     other.outerEnumIntegerDefaultValue == outerEnumIntegerDefaultValue;
 
-  @override
+
-  int get hashCode =>
+    @override
-    enumString.hashCode +
+    bool operator ==(Object other) => identical(this, other) || other is EnumTest &&
-    enumStringRequired.hashCode +
+      other.enumString == enumString &&
-    enumInteger.hashCode +
+      other.enumStringRequired == enumStringRequired &&
-    enumNumber.hashCode +
+      other.enumInteger == enumInteger &&
-    (outerEnum == null ? 0 : outerEnum.hashCode) +
+      other.enumNumber == enumNumber &&
-    outerEnumInteger.hashCode +
+      other.outerEnum == outerEnum &&
-    outerEnumDefaultValue.hashCode +
+      other.outerEnumInteger == outerEnumInteger &&
-    outerEnumIntegerDefaultValue.hashCode;
+      other.outerEnumDefaultValue == outerEnumDefaultValue &&
+      other.outerEnumIntegerDefaultValue == outerEnumIntegerDefaultValue;
+
+    @override
+    int get hashCode =>
+        enumString.hashCode +
+        enumStringRequired.hashCode +
+        enumInteger.hashCode +
+        enumNumber.hashCode +
+        (outerEnum == null ? 0 : outerEnum.hashCode) +
+        outerEnumInteger.hashCode +
+        outerEnumDefaultValue.hashCode +
+        outerEnumIntegerDefaultValue.hashCode;
 
   factory EnumTest.fromJson(Map<String, dynamic> json) => _$EnumTestFromJson(json);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/fake_big_decimal_map200_response.dart

@@ -47,15 +47,17 @@ class FakeBigDecimalMap200Response {
 
 
 
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is FakeBigDecimalMap200Response &&
-     other.someId == someId &&
-     other.someMap == someMap;
 
-  @override
+
-  int get hashCode =>
+    @override
-    someId.hashCode +
+    bool operator ==(Object other) => identical(this, other) || other is FakeBigDecimalMap200Response &&
-    someMap.hashCode;
+      other.someId == someId &&
+      other.someMap == someMap;
+
+    @override
+    int get hashCode =>
+        someId.hashCode +
+        someMap.hashCode;
 
   factory FakeBigDecimalMap200Response.fromJson(Map<String, dynamic> json) => _$FakeBigDecimalMap200ResponseFromJson(json);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/file_schema_test_class.dart

@@ -48,15 +48,17 @@ class FileSchemaTestClass {
 
 
 
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is FileSchemaTestClass &&
-     other.file == file &&
-     other.files == files;
 
-  @override
+
-  int get hashCode =>
+    @override
-    file.hashCode +
+    bool operator ==(Object other) => identical(this, other) || other is FileSchemaTestClass &&
-    files.hashCode;
+      other.file == file &&
+      other.files == files;
+
+    @override
+    int get hashCode =>
+        file.hashCode +
+        files.hashCode;
 
   factory FileSchemaTestClass.fromJson(Map<String, dynamic> json) => _$FileSchemaTestClassFromJson(json);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/foo.dart

@@ -33,13 +33,15 @@ class Foo {
 
 
 
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is Foo &&
-     other.bar == bar;
 
-  @override
+
-  int get hashCode =>
+    @override
-    bar.hashCode;
+    bool operator ==(Object other) => identical(this, other) || other is Foo &&
+      other.bar == bar;
+
+    @override
+    int get hashCode =>
+        bar.hashCode;
 
   factory Foo.fromJson(Map<String, dynamic> json) => _$FooFromJson(json);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/foo_get_default_response.dart

@@ -34,13 +34,15 @@ class FooGetDefaultResponse {
 
 
 
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is FooGetDefaultResponse &&
-     other.string == string;
 
-  @override
+
-  int get hashCode =>
+    @override
-    string.hashCode;
+    bool operator ==(Object other) => identical(this, other) || other is FooGetDefaultResponse &&
+      other.string == string;
+
+    @override
+    int get hashCode =>
+        string.hashCode;
 
   factory FooGetDefaultResponse.fromJson(Map<String, dynamic> json) => _$FooGetDefaultResponseFromJson(json);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/format_test.dart

@@ -251,43 +251,45 @@ class FormatTest {
 
 
 
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is FormatTest &&
-     other.integer == integer &&
-     other.int32 == int32 &&
-     other.int64 == int64 &&
-     other.number == number &&
-     other.float == float &&
-     other.double_ == double_ &&
-     other.decimal == decimal &&
-     other.string == string &&
-     other.byte == byte &&
-     other.binary == binary &&
-     other.date == date &&
-     other.dateTime == dateTime &&
-     other.uuid == uuid &&
-     other.password == password &&
-     other.patternWithDigits == patternWithDigits &&
-     other.patternWithDigitsAndDelimiter == patternWithDigitsAndDelimiter;
 
-  @override
+
-  int get hashCode =>
+    @override
-    integer.hashCode +
+    bool operator ==(Object other) => identical(this, other) || other is FormatTest &&
-    int32.hashCode +
+      other.integer == integer &&
-    int64.hashCode +
+      other.int32 == int32 &&
-    number.hashCode +
+      other.int64 == int64 &&
-    float.hashCode +
+      other.number == number &&
-    double_.hashCode +
+      other.float == float &&
-    decimal.hashCode +
+      other.double_ == double_ &&
-    string.hashCode +
+      other.decimal == decimal &&
-    byte.hashCode +
+      other.string == string &&
-    binary.hashCode +
+      other.byte == byte &&
-    date.hashCode +
+      other.binary == binary &&
-    dateTime.hashCode +
+      other.date == date &&
-    uuid.hashCode +
+      other.dateTime == dateTime &&
-    password.hashCode +
+      other.uuid == uuid &&
-    patternWithDigits.hashCode +
+      other.password == password &&
-    patternWithDigitsAndDelimiter.hashCode;
+      other.patternWithDigits == patternWithDigits &&
+      other.patternWithDigitsAndDelimiter == patternWithDigitsAndDelimiter;
+
+    @override
+    int get hashCode =>
+        integer.hashCode +
+        int32.hashCode +
+        int64.hashCode +
+        number.hashCode +
+        float.hashCode +
+        double_.hashCode +
+        decimal.hashCode +
+        string.hashCode +
+        byte.hashCode +
+        binary.hashCode +
+        date.hashCode +
+        dateTime.hashCode +
+        uuid.hashCode +
+        password.hashCode +
+        patternWithDigits.hashCode +
+        patternWithDigitsAndDelimiter.hashCode;
 
   factory FormatTest.fromJson(Map<String, dynamic> json) => _$FormatTestFromJson(json);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/has_only_read_only.dart

@@ -47,15 +47,17 @@ class HasOnlyReadOnly {
 
 
 
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is HasOnlyReadOnly &&
-     other.bar == bar &&
-     other.foo == foo;
 
-  @override
+
-  int get hashCode =>
+    @override
-    bar.hashCode +
+    bool operator ==(Object other) => identical(this, other) || other is HasOnlyReadOnly &&
-    foo.hashCode;
+      other.bar == bar &&
+      other.foo == foo;
+
+    @override
+    int get hashCode =>
+        bar.hashCode +
+        foo.hashCode;
 
   factory HasOnlyReadOnly.fromJson(Map<String, dynamic> json) => _$HasOnlyReadOnlyFromJson(json);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/health_check_result.dart

@@ -33,13 +33,15 @@ class HealthCheckResult {
 
 
 
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is HealthCheckResult &&
-     other.nullableMessage == nullableMessage;
 
-  @override
+
-  int get hashCode =>
+    @override
-    (nullableMessage == null ? 0 : nullableMessage.hashCode);
+    bool operator ==(Object other) => identical(this, other) || other is HealthCheckResult &&
+      other.nullableMessage == nullableMessage;
+
+    @override
+    int get hashCode =>
+        (nullableMessage == null ? 0 : nullableMessage.hashCode);
 
   factory HealthCheckResult.fromJson(Map<String, dynamic> json) => _$HealthCheckResultFromJson(json);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/map_test.dart

@@ -75,19 +75,21 @@ class MapTest {
 
 
 
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is MapTest &&
-     other.mapMapOfString == mapMapOfString &&
-     other.mapOfEnumString == mapOfEnumString &&
-     other.directMap == directMap &&
-     other.indirectMap == indirectMap;
 
-  @override
+
-  int get hashCode =>
+    @override
-    mapMapOfString.hashCode +
+    bool operator ==(Object other) => identical(this, other) || other is MapTest &&
-    mapOfEnumString.hashCode +
+      other.mapMapOfString == mapMapOfString &&
-    directMap.hashCode +
+      other.mapOfEnumString == mapOfEnumString &&
-    indirectMap.hashCode;
+      other.directMap == directMap &&
+      other.indirectMap == indirectMap;
+
+    @override
+    int get hashCode =>
+        mapMapOfString.hashCode +
+        mapOfEnumString.hashCode +
+        directMap.hashCode +
+        indirectMap.hashCode;
 
   factory MapTest.fromJson(Map<String, dynamic> json) => _$MapTestFromJson(json);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/mixed_properties_and_additional_properties_class.dart

@@ -62,17 +62,19 @@ class MixedPropertiesAndAdditionalPropertiesClass {
 
 
 
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is MixedPropertiesAndAdditionalPropertiesClass &&
-     other.uuid == uuid &&
-     other.dateTime == dateTime &&
-     other.map == map;
 
-  @override
+
-  int get hashCode =>
+    @override
-    uuid.hashCode +
+    bool operator ==(Object other) => identical(this, other) || other is MixedPropertiesAndAdditionalPropertiesClass &&
-    dateTime.hashCode +
+      other.uuid == uuid &&
-    map.hashCode;
+      other.dateTime == dateTime &&
+      other.map == map;
+
+    @override
+    int get hashCode =>
+        uuid.hashCode +
+        dateTime.hashCode +
+        map.hashCode;
 
   factory MixedPropertiesAndAdditionalPropertiesClass.fromJson(Map<String, dynamic> json) => _$MixedPropertiesAndAdditionalPropertiesClassFromJson(json);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/model200_response.dart

@@ -47,15 +47,17 @@ class Model200Response {
 
 
 
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is Model200Response &&
-     other.name == name &&
-     other.class_ == class_;
 
-  @override
+
-  int get hashCode =>
+    @override
-    name.hashCode +
+    bool operator ==(Object other) => identical(this, other) || other is Model200Response &&
-    class_.hashCode;
+      other.name == name &&
+      other.class_ == class_;
+
+    @override
+    int get hashCode =>
+        name.hashCode +
+        class_.hashCode;
 
   factory Model200Response.fromJson(Map<String, dynamic> json) => _$Model200ResponseFromJson(json);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/model_client.dart

@@ -33,13 +33,15 @@ class ModelClient {
 
 
 
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is ModelClient &&
-     other.client == client;
 
-  @override
+
-  int get hashCode =>
+    @override
-    client.hashCode;
+    bool operator ==(Object other) => identical(this, other) || other is ModelClient &&
+      other.client == client;
+
+    @override
+    int get hashCode =>
+        client.hashCode;
 
   factory ModelClient.fromJson(Map<String, dynamic> json) => _$ModelClientFromJson(json);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/model_enum_class.dart

@@ -7,14 +7,14 @@ import 'package:json_annotation/json_annotation.dart';
 
 
 enum ModelEnumClass {
-  @JsonValue(r'_abc')
+      @JsonValue(r'_abc')
-  abc(r'_abc'),
+      abc(r'_abc'),
-  @JsonValue(r'-efg')
+      @JsonValue(r'-efg')
-  efg(r'-efg'),
+      efg(r'-efg'),
-  @JsonValue(r'(xyz)')
+      @JsonValue(r'(xyz)')
-  leftParenthesisXyzRightParenthesis(r'(xyz)'),
+      leftParenthesisXyzRightParenthesis(r'(xyz)'),
-  @JsonValue(r'unknown_default_open_api')
+      @JsonValue(r'unknown_default_open_api')
-  unknownDefaultOpenApi(r'unknown_default_open_api');
+      unknownDefaultOpenApi(r'unknown_default_open_api');
 
   const ModelEnumClass(this.value);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/model_file.dart

@@ -34,13 +34,15 @@ class ModelFile {
 
 
 
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is ModelFile &&
-     other.sourceURI == sourceURI;
 
-  @override
+
-  int get hashCode =>
+    @override
-    sourceURI.hashCode;
+    bool operator ==(Object other) => identical(this, other) || other is ModelFile &&
+      other.sourceURI == sourceURI;
+
+    @override
+    int get hashCode =>
+        sourceURI.hashCode;
 
   factory ModelFile.fromJson(Map<String, dynamic> json) => _$ModelFileFromJson(json);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/model_list.dart

@@ -33,13 +33,15 @@ class ModelList {
 
 
 
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is ModelList &&
-     other.n123list == n123list;
 
-  @override
+
-  int get hashCode =>
+    @override
-    n123list.hashCode;
+    bool operator ==(Object other) => identical(this, other) || other is ModelList &&
+      other.n123list == n123list;
+
+    @override
+    int get hashCode =>
+        n123list.hashCode;
 
   factory ModelList.fromJson(Map<String, dynamic> json) => _$ModelListFromJson(json);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/model_return.dart

@@ -33,13 +33,15 @@ class ModelReturn {
 
 
 
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is ModelReturn &&
-     other.return_ == return_;
 
-  @override
+
-  int get hashCode =>
+    @override
-    return_.hashCode;
+    bool operator ==(Object other) => identical(this, other) || other is ModelReturn &&
+      other.return_ == return_;
+
+    @override
+    int get hashCode =>
+        return_.hashCode;
 
   factory ModelReturn.fromJson(Map<String, dynamic> json) => _$ModelReturnFromJson(json);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/name.dart

@@ -75,19 +75,21 @@ class Name {
 
 
 
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is Name &&
-     other.name == name &&
-     other.snakeCase == snakeCase &&
-     other.property == property &&
-     other.n123number == n123number;
 
-  @override
+
-  int get hashCode =>
+    @override
-    name.hashCode +
+    bool operator ==(Object other) => identical(this, other) || other is Name &&
-    snakeCase.hashCode +
+      other.name == name &&
-    property.hashCode +
+      other.snakeCase == snakeCase &&
-    n123number.hashCode;
+      other.property == property &&
+      other.n123number == n123number;
+
+    @override
+    int get hashCode =>
+        name.hashCode +
+        snakeCase.hashCode +
+        property.hashCode +
+        n123number.hashCode;
 
   factory Name.fromJson(Map<String, dynamic> json) => _$NameFromJson(json);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/nullable_class.dart

@@ -187,35 +187,37 @@ class NullableClass {
 
 
 
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is NullableClass &&
-     other.integerProp == integerProp &&
-     other.numberProp == numberProp &&
-     other.booleanProp == booleanProp &&
-     other.stringProp == stringProp &&
-     other.dateProp == dateProp &&
-     other.datetimeProp == datetimeProp &&
-     other.arrayNullableProp == arrayNullableProp &&
-     other.arrayAndItemsNullableProp == arrayAndItemsNullableProp &&
-     other.arrayItemsNullable == arrayItemsNullable &&
-     other.objectNullableProp == objectNullableProp &&
-     other.objectAndItemsNullableProp == objectAndItemsNullableProp &&
-     other.objectItemsNullable == objectItemsNullable;
 
-  @override
+
-  int get hashCode =>
+    @override
-    (integerProp == null ? 0 : integerProp.hashCode) +
+    bool operator ==(Object other) => identical(this, other) || other is NullableClass &&
-    (numberProp == null ? 0 : numberProp.hashCode) +
+      other.integerProp == integerProp &&
-    (booleanProp == null ? 0 : booleanProp.hashCode) +
+      other.numberProp == numberProp &&
-    (stringProp == null ? 0 : stringProp.hashCode) +
+      other.booleanProp == booleanProp &&
-    (dateProp == null ? 0 : dateProp.hashCode) +
+      other.stringProp == stringProp &&
-    (datetimeProp == null ? 0 : datetimeProp.hashCode) +
+      other.dateProp == dateProp &&
-    (arrayNullableProp == null ? 0 : arrayNullableProp.hashCode) +
+      other.datetimeProp == datetimeProp &&
-    (arrayAndItemsNullableProp == null ? 0 : arrayAndItemsNullableProp.hashCode) +
+      other.arrayNullableProp == arrayNullableProp &&
-    arrayItemsNullable.hashCode +
+      other.arrayAndItemsNullableProp == arrayAndItemsNullableProp &&
-    (objectNullableProp == null ? 0 : objectNullableProp.hashCode) +
+      other.arrayItemsNullable == arrayItemsNullable &&
-    (objectAndItemsNullableProp == null ? 0 : objectAndItemsNullableProp.hashCode) +
+      other.objectNullableProp == objectNullableProp &&
-    objectItemsNullable.hashCode;
+      other.objectAndItemsNullableProp == objectAndItemsNullableProp &&
+      other.objectItemsNullable == objectItemsNullable;
+
+    @override
+    int get hashCode =>
+        (integerProp == null ? 0 : integerProp.hashCode) +
+        (numberProp == null ? 0 : numberProp.hashCode) +
+        (booleanProp == null ? 0 : booleanProp.hashCode) +
+        (stringProp == null ? 0 : stringProp.hashCode) +
+        (dateProp == null ? 0 : dateProp.hashCode) +
+        (datetimeProp == null ? 0 : datetimeProp.hashCode) +
+        (arrayNullableProp == null ? 0 : arrayNullableProp.hashCode) +
+        (arrayAndItemsNullableProp == null ? 0 : arrayAndItemsNullableProp.hashCode) +
+        arrayItemsNullable.hashCode +
+        (objectNullableProp == null ? 0 : objectNullableProp.hashCode) +
+        (objectAndItemsNullableProp == null ? 0 : objectAndItemsNullableProp.hashCode) +
+        objectItemsNullable.hashCode;
 
   factory NullableClass.fromJson(Map<String, dynamic> json) => _$NullableClassFromJson(json);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/number_only.dart

@@ -33,13 +33,15 @@ class NumberOnly {
 
 
 
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is NumberOnly &&
-     other.justNumber == justNumber;
 
-  @override
+
-  int get hashCode =>
+    @override
-    justNumber.hashCode;
+    bool operator ==(Object other) => identical(this, other) || other is NumberOnly &&
+      other.justNumber == justNumber;
+
+    @override
+    int get hashCode =>
+        justNumber.hashCode;
 
   factory NumberOnly.fromJson(Map<String, dynamic> json) => _$NumberOnlyFromJson(json);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/object_with_deprecated_fields.dart

@@ -79,19 +79,21 @@ class ObjectWithDeprecatedFields {
 
 
 
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is ObjectWithDeprecatedFields &&
-     other.uuid == uuid &&
-     other.id == id &&
-     other.deprecatedRef == deprecatedRef &&
-     other.bars == bars;
 
-  @override
+
-  int get hashCode =>
+    @override
-    uuid.hashCode +
+    bool operator ==(Object other) => identical(this, other) || other is ObjectWithDeprecatedFields &&
-    id.hashCode +
+      other.uuid == uuid &&
-    deprecatedRef.hashCode +
+      other.id == id &&
-    bars.hashCode;
+      other.deprecatedRef == deprecatedRef &&
+      other.bars == bars;
+
+    @override
+    int get hashCode =>
+        uuid.hashCode +
+        id.hashCode +
+        deprecatedRef.hashCode +
+        bars.hashCode;
 
   factory ObjectWithDeprecatedFields.fromJson(Map<String, dynamic> json) => _$ObjectWithDeprecatedFieldsFromJson(json);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/order.dart

@@ -104,23 +104,25 @@ class Order {
 
 
 
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is Order &&
-     other.id == id &&
-     other.petId == petId &&
-     other.quantity == quantity &&
-     other.shipDate == shipDate &&
-     other.status == status &&
-     other.complete == complete;
 
-  @override
+
-  int get hashCode =>
+    @override
-    id.hashCode +
+    bool operator ==(Object other) => identical(this, other) || other is Order &&
-    petId.hashCode +
+      other.id == id &&
-    quantity.hashCode +
+      other.petId == petId &&
-    shipDate.hashCode +
+      other.quantity == quantity &&
-    status.hashCode +
+      other.shipDate == shipDate &&
-    complete.hashCode;
+      other.status == status &&
+      other.complete == complete;
+
+    @override
+    int get hashCode =>
+        id.hashCode +
+        petId.hashCode +
+        quantity.hashCode +
+        shipDate.hashCode +
+        status.hashCode +
+        complete.hashCode;
 
   factory Order.fromJson(Map<String, dynamic> json) => _$OrderFromJson(json);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_composite.dart

@@ -61,17 +61,19 @@ class OuterComposite {
 
 
 
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is OuterComposite &&
-     other.myNumber == myNumber &&
-     other.myString == myString &&
-     other.myBoolean == myBoolean;
 
-  @override
+
-  int get hashCode =>
+    @override
-    myNumber.hashCode +
+    bool operator ==(Object other) => identical(this, other) || other is OuterComposite &&
-    myString.hashCode +
+      other.myNumber == myNumber &&
-    myBoolean.hashCode;
+      other.myString == myString &&
+      other.myBoolean == myBoolean;
+
+    @override
+    int get hashCode =>
+        myNumber.hashCode +
+        myString.hashCode +
+        myBoolean.hashCode;
 
   factory OuterComposite.fromJson(Map<String, dynamic> json) => _$OuterCompositeFromJson(json);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum.dart

@@ -7,14 +7,14 @@ import 'package:json_annotation/json_annotation.dart';
 
 
 enum OuterEnum {
-  @JsonValue(r'placed')
+      @JsonValue(r'placed')
-  placed(r'placed'),
+      placed(r'placed'),
-  @JsonValue(r'approved')
+      @JsonValue(r'approved')
-  approved(r'approved'),
+      approved(r'approved'),
-  @JsonValue(r'delivered')
+      @JsonValue(r'delivered')
-  delivered(r'delivered'),
+      delivered(r'delivered'),
-  @JsonValue(r'unknown_default_open_api')
+      @JsonValue(r'unknown_default_open_api')
-  unknownDefaultOpenApi(r'unknown_default_open_api');
+      unknownDefaultOpenApi(r'unknown_default_open_api');
 
   const OuterEnum(this.value);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum_default_value.dart

@@ -7,14 +7,14 @@ import 'package:json_annotation/json_annotation.dart';
 
 
 enum OuterEnumDefaultValue {
-  @JsonValue(r'placed')
+      @JsonValue(r'placed')
-  placed(r'placed'),
+      placed(r'placed'),
-  @JsonValue(r'approved')
+      @JsonValue(r'approved')
-  approved(r'approved'),
+      approved(r'approved'),
-  @JsonValue(r'delivered')
+      @JsonValue(r'delivered')
-  delivered(r'delivered'),
+      delivered(r'delivered'),
-  @JsonValue(r'unknown_default_open_api')
+      @JsonValue(r'unknown_default_open_api')
-  unknownDefaultOpenApi(r'unknown_default_open_api');
+      unknownDefaultOpenApi(r'unknown_default_open_api');
 
   const OuterEnumDefaultValue(this.value);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum_integer.dart

@@ -7,14 +7,14 @@ import 'package:json_annotation/json_annotation.dart';
 
 
 enum OuterEnumInteger {
-  @JsonValue(0)
+      @JsonValue(0)
-  number0('0'),
+      number0('0'),
-  @JsonValue(1)
+      @JsonValue(1)
-  number1('1'),
+      number1('1'),
-  @JsonValue(2)
+      @JsonValue(2)
-  number2('2'),
+      number2('2'),
-  @JsonValue(11184809)
+      @JsonValue(11184809)
-  unknownDefaultOpenApi('11184809');
+      unknownDefaultOpenApi('11184809');
 
   const OuterEnumInteger(this.value);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_enum_integer_default_value.dart

@@ -7,14 +7,14 @@ import 'package:json_annotation/json_annotation.dart';
 
 
 enum OuterEnumIntegerDefaultValue {
-  @JsonValue(0)
+      @JsonValue(0)
-  number0('0'),
+      number0('0'),
-  @JsonValue(1)
+      @JsonValue(1)
-  number1('1'),
+      number1('1'),
-  @JsonValue(2)
+      @JsonValue(2)
-  number2('2'),
+      number2('2'),
-  @JsonValue(11184809)
+      @JsonValue(11184809)
-  unknownDefaultOpenApi('11184809');
+      unknownDefaultOpenApi('11184809');
 
   const OuterEnumIntegerDefaultValue(this.value);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_object_with_enum_property.dart

@@ -34,13 +34,15 @@ class OuterObjectWithEnumProperty {
 
 
 
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is OuterObjectWithEnumProperty &&
-     other.value == value;
 
-  @override
+
-  int get hashCode =>
+    @override
-    value.hashCode;
+    bool operator ==(Object other) => identical(this, other) || other is OuterObjectWithEnumProperty &&
+      other.value == value;
+
+    @override
+    int get hashCode =>
+        value.hashCode;
 
   factory OuterObjectWithEnumProperty.fromJson(Map<String, dynamic> json) => _$OuterObjectWithEnumPropertyFromJson(json);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/parent_with_nullable.dart

@@ -47,15 +47,17 @@ class ParentWithNullable {
 
 
 
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is ParentWithNullable &&
-     other.type == type &&
-     other.nullableProperty == nullableProperty;
 
-  @override
+
-  int get hashCode =>
+    @override
-    type.hashCode +
+    bool operator ==(Object other) => identical(this, other) || other is ParentWithNullable &&
-    (nullableProperty == null ? 0 : nullableProperty.hashCode);
+      other.type == type &&
+      other.nullableProperty == nullableProperty;
+
+    @override
+    int get hashCode =>
+        type.hashCode +
+        (nullableProperty == null ? 0 : nullableProperty.hashCode);
 
   factory ParentWithNullable.fromJson(Map<String, dynamic> json) => _$ParentWithNullableFromJson(json);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/pet.dart

@@ -106,23 +106,25 @@ class Pet {
 
 
 
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is Pet &&
-     other.id == id &&
-     other.category == category &&
-     other.name == name &&
-     other.photoUrls == photoUrls &&
-     other.tags == tags &&
-     other.status == status;
 
-  @override
+
-  int get hashCode =>
+    @override
-    id.hashCode +
+    bool operator ==(Object other) => identical(this, other) || other is Pet &&
-    category.hashCode +
+      other.id == id &&
-    name.hashCode +
+      other.category == category &&
-    photoUrls.hashCode +
+      other.name == name &&
-    tags.hashCode +
+      other.photoUrls == photoUrls &&
-    status.hashCode;
+      other.tags == tags &&
+      other.status == status;
+
+    @override
+    int get hashCode =>
+        id.hashCode +
+        category.hashCode +
+        name.hashCode +
+        photoUrls.hashCode +
+        tags.hashCode +
+        status.hashCode;
 
   factory Pet.fromJson(Map<String, dynamic> json) => _$PetFromJson(json);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/read_only_first.dart

@@ -47,15 +47,17 @@ class ReadOnlyFirst {
 
 
 
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is ReadOnlyFirst &&
-     other.bar == bar &&
-     other.baz == baz;
 
-  @override
+
-  int get hashCode =>
+    @override
-    bar.hashCode +
+    bool operator ==(Object other) => identical(this, other) || other is ReadOnlyFirst &&
-    baz.hashCode;
+      other.bar == bar &&
+      other.baz == baz;
+
+    @override
+    int get hashCode =>
+        bar.hashCode +
+        baz.hashCode;
 
   factory ReadOnlyFirst.fromJson(Map<String, dynamic> json) => _$ReadOnlyFirstFromJson(json);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/single_ref_type.dart

@@ -7,12 +7,12 @@ import 'package:json_annotation/json_annotation.dart';
 
 
 enum SingleRefType {
-  @JsonValue(r'admin')
+      @JsonValue(r'admin')
-  admin(r'admin'),
+      admin(r'admin'),
-  @JsonValue(r'user')
+      @JsonValue(r'user')
-  user(r'user'),
+      user(r'user'),
-  @JsonValue(r'unknown_default_open_api')
+      @JsonValue(r'unknown_default_open_api')
-  unknownDefaultOpenApi(r'unknown_default_open_api');
+      unknownDefaultOpenApi(r'unknown_default_open_api');
 
   const SingleRefType(this.value);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/special_model_name.dart

@@ -33,13 +33,15 @@ class SpecialModelName {
 
 
 
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is SpecialModelName &&
-     other.dollarSpecialLeftSquareBracketPropertyPeriodNameRightSquareBracket == dollarSpecialLeftSquareBracketPropertyPeriodNameRightSquareBracket;
 
-  @override
+
-  int get hashCode =>
+    @override
-    dollarSpecialLeftSquareBracketPropertyPeriodNameRightSquareBracket.hashCode;
+    bool operator ==(Object other) => identical(this, other) || other is SpecialModelName &&
+      other.dollarSpecialLeftSquareBracketPropertyPeriodNameRightSquareBracket == dollarSpecialLeftSquareBracketPropertyPeriodNameRightSquareBracket;
+
+    @override
+    int get hashCode =>
+        dollarSpecialLeftSquareBracketPropertyPeriodNameRightSquareBracket.hashCode;
 
   factory SpecialModelName.fromJson(Map<String, dynamic> json) => _$SpecialModelNameFromJson(json);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/tag.dart

@@ -47,15 +47,17 @@ class Tag {
 
 
 
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is Tag &&
-     other.id == id &&
-     other.name == name;
 
-  @override
+
-  int get hashCode =>
+    @override
-    id.hashCode +
+    bool operator ==(Object other) => identical(this, other) || other is Tag &&
-    name.hashCode;
+      other.id == id &&
+      other.name == name;
+
+    @override
+    int get hashCode =>
+        id.hashCode +
+        name.hashCode;
 
   factory Tag.fromJson(Map<String, dynamic> json) => _$TagFromJson(json);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/test_inline_freeform_additional_properties_request.dart

@@ -33,13 +33,15 @@ class TestInlineFreeformAdditionalPropertiesRequest {
 
 
 
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is TestInlineFreeformAdditionalPropertiesRequest &&
-     other.someProperty == someProperty;
 
-  @override
+
-  int get hashCode =>
+    @override
-    someProperty.hashCode;
+    bool operator ==(Object other) => identical(this, other) || other is TestInlineFreeformAdditionalPropertiesRequest &&
+      other.someProperty == someProperty;
+
+    @override
+    int get hashCode =>
+        someProperty.hashCode;
 
   factory TestInlineFreeformAdditionalPropertiesRequest.fromJson(Map<String, dynamic> json) => _$TestInlineFreeformAdditionalPropertiesRequestFromJson(json);
 

samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/user.dart

@@ -132,27 +132,29 @@ class User {
 
 
 
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is User &&
-     other.id == id &&
-     other.username == username &&
-     other.firstName == firstName &&
-     other.lastName == lastName &&
-     other.email == email &&
-     other.password == password &&
-     other.phone == phone &&
-     other.userStatus == userStatus;
 
-  @override
+
-  int get hashCode =>
+    @override
-    id.hashCode +
+    bool operator ==(Object other) => identical(this, other) || other is User &&
-    username.hashCode +
+      other.id == id &&
-    firstName.hashCode +
+      other.username == username &&
-    lastName.hashCode +
+      other.firstName == firstName &&
-    email.hashCode +
+      other.lastName == lastName &&
-    password.hashCode +
+      other.email == email &&
-    phone.hashCode +
+      other.password == password &&
-    userStatus.hashCode;
+      other.phone == phone &&
+      other.userStatus == userStatus;
+
+    @override
+    int get hashCode =>
+        id.hashCode +
+        username.hashCode +
+        firstName.hashCode +
+        lastName.hashCode +
+        email.hashCode +
+        password.hashCode +
+        phone.hashCode +
+        userStatus.hashCode;
 
   factory User.fromJson(Map<String, dynamic> json) => _$UserFromJson(json);