diff --git a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/json_serializable/class.mustache b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/json_serializable/class.mustache
index a670c63e880f..88a25b71783f 100644
--- a/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/json_serializable/class.mustache
+++ b/modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/json_serializable/class.mustache
@@ -46,7 +46,12 @@ class {{{classname}}} {
     {{#defaultValue}}defaultValue: {{{defaultValue}}},{{/defaultValue}}
     name: r'{{{baseName}}}',
     required: {{#required}}true{{/required}}{{^required}}false{{/required}},
-    includeIfNull: {{#required}}{{#isNullable}}true{{/isNullable}}{{^isNullable}}false{{/isNullable}}{{/required}}{{^required}}false{{/required}}
+    includeIfNull: {{#required}}{{#isNullable}}true{{/isNullable}}{{^isNullable}}false{{/isNullable}}{{/required}}{{^required}}false{{/required}},
+  {{#isEnumOrRef}}
+  {{#enumUnknownDefaultCase}}
+  unknownEnumValue: {{{datatypeWithEnum}}}.unknownDefaultOpenApi,
+  {{/enumUnknownDefaultCase}}
+  {{/isEnumOrRef}}
   )
   {{/isBinary}}
   {{#isBinary}}
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/additional_properties_class.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/additional_properties_class.dart
index 7cedba75141f..8a187d3dc3c0 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/additional_properties_class.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/additional_properties_class.dart
@@ -27,7 +27,7 @@ class AdditionalPropertiesClass {
     
     name: r'map_property',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -39,7 +39,7 @@ class AdditionalPropertiesClass {
     
     name: r'map_of_map_property',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/all_of_with_single_ref.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/all_of_with_single_ref.dart
index 2b799c619dc2..c196447ea5e4 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/all_of_with_single_ref.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/all_of_with_single_ref.dart
@@ -28,7 +28,7 @@ class AllOfWithSingleRef {
     
     name: r'username',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -40,7 +40,8 @@ class AllOfWithSingleRef {
     
     name: r'SingleRefType',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
+  unknownEnumValue: SingleRefType.unknownDefaultOpenApi,
   )
 
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/animal.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/animal.dart
index 19c22c9351e7..732326357226 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/animal.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/animal.dart
@@ -27,7 +27,7 @@ class Animal {
     
     name: r'className',
     required: true,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -39,7 +39,7 @@ class Animal {
     defaultValue: 'red',
     name: r'color',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/api_response.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/api_response.dart
index 22cdcaff69ba..207cea16eabe 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/api_response.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/api_response.dart
@@ -29,7 +29,7 @@ class ApiResponse {
     
     name: r'code',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -41,7 +41,7 @@ class ApiResponse {
     
     name: r'type',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -53,7 +53,7 @@ class ApiResponse {
     
     name: r'message',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/array_of_array_of_number_only.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/array_of_array_of_number_only.dart
index 79f8bf64fee0..da8de0169296 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/array_of_array_of_number_only.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/array_of_array_of_number_only.dart
@@ -25,7 +25,7 @@ class ArrayOfArrayOfNumberOnly {
     
     name: r'ArrayArrayNumber',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/array_of_number_only.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/array_of_number_only.dart
index d4ecbeff86f2..4ead761e76f7 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/array_of_number_only.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/array_of_number_only.dart
@@ -25,7 +25,7 @@ class ArrayOfNumberOnly {
     
     name: r'ArrayNumber',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/array_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/array_test.dart
index c6f7c38ac76b..0968d4b12986 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/array_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/array_test.dart
@@ -30,7 +30,7 @@ class ArrayTest {
     
     name: r'array_of_string',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -42,7 +42,7 @@ class ArrayTest {
     
     name: r'array_array_of_integer',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -54,7 +54,7 @@ class ArrayTest {
     
     name: r'array_array_of_model',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/capitalization.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/capitalization.dart
index 2c996e5c71bf..d2bc40f33836 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/capitalization.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/capitalization.dart
@@ -35,7 +35,7 @@ class Capitalization {
     
     name: r'smallCamel',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -47,7 +47,7 @@ class Capitalization {
     
     name: r'CapitalCamel',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -59,7 +59,7 @@ class Capitalization {
     
     name: r'small_Snake',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -71,7 +71,7 @@ class Capitalization {
     
     name: r'Capital_Snake',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -83,7 +83,7 @@ class Capitalization {
     
     name: r'SCA_ETH_Flow_Points',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -96,7 +96,7 @@ class Capitalization {
     
     name: r'ATT_NAME',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/cat.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/cat.dart
index b468550dce5a..e2df6f2cc557 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/cat.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/cat.dart
@@ -32,7 +32,7 @@ class Cat {
     
     name: r'className',
     required: true,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -44,7 +44,7 @@ class Cat {
     defaultValue: 'red',
     name: r'color',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -56,7 +56,7 @@ class Cat {
     
     name: r'declawed',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/category.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/category.dart
index ffa8d07de9d5..6d078b06ae20 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/category.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/category.dart
@@ -27,7 +27,7 @@ class Category {
     
     name: r'id',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -39,7 +39,7 @@ class Category {
     defaultValue: 'default-name',
     name: r'name',
     required: true,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/child_with_nullable.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/child_with_nullable.dart
index 61faa249bc45..dcda6f93ba6a 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/child_with_nullable.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/child_with_nullable.dart
@@ -32,7 +32,8 @@ class ChildWithNullable {
     
     name: r'type',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
+  unknownEnumValue: ChildWithNullableTypeEnum.unknownDefaultOpenApi,
   )
 
 
@@ -44,7 +45,7 @@ class ChildWithNullable {
     
     name: r'nullableProperty',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -56,7 +57,7 @@ class ChildWithNullable {
     
     name: r'otherProperty',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/class_model.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/class_model.dart
index 28a10ad25734..40b6b45ac3c4 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/class_model.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/class_model.dart
@@ -25,7 +25,7 @@ class ClassModel {
     
     name: r'_class',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/deprecated_object.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/deprecated_object.dart
index 7598e9464681..68d1df4016c1 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/deprecated_object.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/deprecated_object.dart
@@ -26,7 +26,7 @@ class DeprecatedObject {
     
     name: r'name',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/dog.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/dog.dart
index 8a5b55baf106..deb271b6dc3b 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/dog.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/dog.dart
@@ -32,7 +32,7 @@ class Dog {
     
     name: r'className',
     required: true,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -44,7 +44,7 @@ class Dog {
     defaultValue: 'red',
     name: r'color',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -56,7 +56,7 @@ class Dog {
     
     name: r'breed',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/enum_arrays.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/enum_arrays.dart
index 6e2c199d3845..632fd933d6e8 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/enum_arrays.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/enum_arrays.dart
@@ -27,7 +27,8 @@ class EnumArrays {
     
     name: r'just_symbol',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
+  unknownEnumValue: EnumArraysJustSymbolEnum.unknownDefaultOpenApi,
   )
 
 
@@ -39,7 +40,8 @@ class EnumArrays {
     
     name: r'array_enum',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
+  unknownEnumValue: List<EnumArraysArrayEnumEnum>.unknownDefaultOpenApi,
   )
 
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/enum_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/enum_test.dart
index 7aa72fe0559c..563f7038b97f 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/enum_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/enum_test.dart
@@ -43,7 +43,8 @@ class EnumTest {
     
     name: r'enum_string',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
+  unknownEnumValue: EnumTestEnumStringEnum.unknownDefaultOpenApi,
   )
 
 
@@ -55,7 +56,8 @@ class EnumTest {
     
     name: r'enum_string_required',
     required: true,
-    includeIfNull: false
+    includeIfNull: false,
+  unknownEnumValue: EnumTestEnumStringRequiredEnum.unknownDefaultOpenApi,
   )
 
 
@@ -67,7 +69,8 @@ class EnumTest {
     
     name: r'enum_integer',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
+  unknownEnumValue: EnumTestEnumIntegerEnum.unknownDefaultOpenApi,
   )
 
 
@@ -79,7 +82,8 @@ class EnumTest {
     
     name: r'enum_number',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
+  unknownEnumValue: EnumTestEnumNumberEnum.unknownDefaultOpenApi,
   )
 
 
@@ -91,7 +95,8 @@ class EnumTest {
     
     name: r'outerEnum',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
+  unknownEnumValue: OuterEnum.unknownDefaultOpenApi,
   )
 
 
@@ -103,7 +108,8 @@ class EnumTest {
     
     name: r'outerEnumInteger',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
+  unknownEnumValue: OuterEnumInteger.unknownDefaultOpenApi,
   )
 
 
@@ -115,7 +121,8 @@ class EnumTest {
     
     name: r'outerEnumDefaultValue',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
+  unknownEnumValue: OuterEnumDefaultValue.unknownDefaultOpenApi,
   )
 
 
@@ -127,7 +134,8 @@ class EnumTest {
     
     name: r'outerEnumIntegerDefaultValue',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
+  unknownEnumValue: OuterEnumIntegerDefaultValue.unknownDefaultOpenApi,
   )
 
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/fake_big_decimal_map200_response.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/fake_big_decimal_map200_response.dart
index d413eadb223e..1f0f2950a71c 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/fake_big_decimal_map200_response.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/fake_big_decimal_map200_response.dart
@@ -27,7 +27,7 @@ class FakeBigDecimalMap200Response {
     
     name: r'someId',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -39,7 +39,7 @@ class FakeBigDecimalMap200Response {
     
     name: r'someMap',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/file_schema_test_class.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/file_schema_test_class.dart
index 55195af35dbd..cde81139a620 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/file_schema_test_class.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/file_schema_test_class.dart
@@ -28,7 +28,7 @@ class FileSchemaTestClass {
     
     name: r'file',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -40,7 +40,7 @@ class FileSchemaTestClass {
     
     name: r'files',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/foo.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/foo.dart
index b8d2d1f2da85..13d38bc30f0d 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/foo.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/foo.dart
@@ -25,7 +25,7 @@ class Foo {
     defaultValue: 'bar',
     name: r'bar',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/foo_get_default_response.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/foo_get_default_response.dart
index 1702a8fcebdd..e153e16cce1a 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/foo_get_default_response.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/foo_get_default_response.dart
@@ -26,7 +26,7 @@ class FooGetDefaultResponse {
     
     name: r'string',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/format_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/format_test.dart
index 65edad5d6461..a20ba417fa54 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/format_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/format_test.dart
@@ -58,7 +58,7 @@ class FormatTest {
     
     name: r'integer',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -72,7 +72,7 @@ class FormatTest {
     
     name: r'int32',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -84,7 +84,7 @@ class FormatTest {
     
     name: r'int64',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -98,7 +98,7 @@ class FormatTest {
     
     name: r'number',
     required: true,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -112,7 +112,7 @@ class FormatTest {
     
     name: r'float',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -126,7 +126,7 @@ class FormatTest {
     
     name: r'double',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -138,7 +138,7 @@ class FormatTest {
     
     name: r'decimal',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -150,7 +150,7 @@ class FormatTest {
     
     name: r'string',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -162,7 +162,7 @@ class FormatTest {
     
     name: r'byte',
     required: true,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -181,7 +181,7 @@ class FormatTest {
     
     name: r'date',
     required: true,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -193,7 +193,7 @@ class FormatTest {
     
     name: r'dateTime',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -205,7 +205,7 @@ class FormatTest {
     
     name: r'uuid',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -217,7 +217,7 @@ class FormatTest {
     
     name: r'password',
     required: true,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -230,7 +230,7 @@ class FormatTest {
     
     name: r'pattern_with_digits',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -243,7 +243,7 @@ class FormatTest {
     
     name: r'pattern_with_digits_and_delimiter',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/has_only_read_only.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/has_only_read_only.dart
index 1cf233f8c337..ef63a2980c30 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/has_only_read_only.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/has_only_read_only.dart
@@ -27,7 +27,7 @@ class HasOnlyReadOnly {
     
     name: r'bar',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -39,7 +39,7 @@ class HasOnlyReadOnly {
     
     name: r'foo',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/health_check_result.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/health_check_result.dart
index a77a95c2e4c8..6fd362cdf351 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/health_check_result.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/health_check_result.dart
@@ -25,7 +25,7 @@ class HealthCheckResult {
     
     name: r'NullableMessage',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/map_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/map_test.dart
index 13cf820e0c9e..59f9377d253a 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/map_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/map_test.dart
@@ -31,7 +31,7 @@ class MapTest {
     
     name: r'map_map_of_string',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -43,7 +43,8 @@ class MapTest {
     
     name: r'map_of_enum_string',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
+  unknownEnumValue: Map<String, MapTestMapOfEnumStringEnum>.unknownDefaultOpenApi,
   )
 
 
@@ -55,7 +56,7 @@ class MapTest {
     
     name: r'direct_map',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -67,7 +68,7 @@ class MapTest {
     
     name: r'indirect_map',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/mixed_properties_and_additional_properties_class.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/mixed_properties_and_additional_properties_class.dart
index c7262a747b22..458d2bd0534b 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/mixed_properties_and_additional_properties_class.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/mixed_properties_and_additional_properties_class.dart
@@ -30,7 +30,7 @@ class MixedPropertiesAndAdditionalPropertiesClass {
     
     name: r'uuid',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -42,7 +42,7 @@ class MixedPropertiesAndAdditionalPropertiesClass {
     
     name: r'dateTime',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -54,7 +54,7 @@ class MixedPropertiesAndAdditionalPropertiesClass {
     
     name: r'map',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/model200_response.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/model200_response.dart
index 4e84da142bd4..47609c700da2 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/model200_response.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/model200_response.dart
@@ -27,7 +27,7 @@ class Model200Response {
     
     name: r'name',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -39,7 +39,7 @@ class Model200Response {
     
     name: r'class',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/model_client.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/model_client.dart
index 29e587b33ac3..8ff470611f22 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/model_client.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/model_client.dart
@@ -25,7 +25,7 @@ class ModelClient {
     
     name: r'client',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/model_file.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/model_file.dart
index 6fc79d9a0690..cccca0412f46 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/model_file.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/model_file.dart
@@ -26,7 +26,7 @@ class ModelFile {
     
     name: r'sourceURI',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/model_list.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/model_list.dart
index cc626409a89c..11421881ae57 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/model_list.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/model_list.dart
@@ -25,7 +25,7 @@ class ModelList {
     
     name: r'123-list',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/model_return.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/model_return.dart
index 5d414ad454d5..ea5427115232 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/model_return.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/model_return.dart
@@ -25,7 +25,7 @@ class ModelReturn {
     
     name: r'return',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/name.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/name.dart
index 172e70e7a9d3..3d16d98780b3 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/name.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/name.dart
@@ -31,7 +31,7 @@ class Name {
     
     name: r'name',
     required: true,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -43,7 +43,7 @@ class Name {
     
     name: r'snake_case',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -55,7 +55,7 @@ class Name {
     
     name: r'property',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -67,7 +67,7 @@ class Name {
     
     name: r'123Number',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/nullable_class.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/nullable_class.dart
index 811eaa2118a7..6f6a484551e4 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/nullable_class.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/nullable_class.dart
@@ -47,7 +47,7 @@ class NullableClass {
     
     name: r'integer_prop',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -59,7 +59,7 @@ class NullableClass {
     
     name: r'number_prop',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -71,7 +71,7 @@ class NullableClass {
     
     name: r'boolean_prop',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -83,7 +83,7 @@ class NullableClass {
     
     name: r'string_prop',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -95,7 +95,7 @@ class NullableClass {
     
     name: r'date_prop',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -107,7 +107,7 @@ class NullableClass {
     
     name: r'datetime_prop',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -119,7 +119,7 @@ class NullableClass {
     
     name: r'array_nullable_prop',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -131,7 +131,7 @@ class NullableClass {
     
     name: r'array_and_items_nullable_prop',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -143,7 +143,7 @@ class NullableClass {
     
     name: r'array_items_nullable',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -155,7 +155,7 @@ class NullableClass {
     
     name: r'object_nullable_prop',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -167,7 +167,7 @@ class NullableClass {
     
     name: r'object_and_items_nullable_prop',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -179,7 +179,7 @@ class NullableClass {
     
     name: r'object_items_nullable',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/number_only.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/number_only.dart
index 71bb0aa221e8..44e9d41a189d 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/number_only.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/number_only.dart
@@ -25,7 +25,7 @@ class NumberOnly {
     
     name: r'JustNumber',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/object_with_deprecated_fields.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/object_with_deprecated_fields.dart
index 7beda7d4aa87..5a36ffb5147e 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/object_with_deprecated_fields.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/object_with_deprecated_fields.dart
@@ -32,7 +32,7 @@ class ObjectWithDeprecatedFields {
     
     name: r'uuid',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -45,7 +45,7 @@ class ObjectWithDeprecatedFields {
     
     name: r'id',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -58,7 +58,7 @@ class ObjectWithDeprecatedFields {
     
     name: r'deprecatedRef',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -71,7 +71,7 @@ class ObjectWithDeprecatedFields {
     
     name: r'bars',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/order.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/order.dart
index 9d745c6dd9a1..dfbc4f5c5e41 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/order.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/order.dart
@@ -35,7 +35,7 @@ class Order {
     
     name: r'id',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -47,7 +47,7 @@ class Order {
     
     name: r'petId',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -59,7 +59,7 @@ class Order {
     
     name: r'quantity',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -71,7 +71,7 @@ class Order {
     
     name: r'shipDate',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -84,7 +84,8 @@ class Order {
     
     name: r'status',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
+  unknownEnumValue: OrderStatusEnum.unknownDefaultOpenApi,
   )
 
 
@@ -96,7 +97,7 @@ class Order {
     defaultValue: false,
     name: r'complete',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_composite.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_composite.dart
index 9986dc4f7d16..a4df9cc62544 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_composite.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_composite.dart
@@ -29,7 +29,7 @@ class OuterComposite {
     
     name: r'my_number',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -41,7 +41,7 @@ class OuterComposite {
     
     name: r'my_string',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -53,7 +53,7 @@ class OuterComposite {
     
     name: r'my_boolean',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_object_with_enum_property.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_object_with_enum_property.dart
index a8602e9183a3..f78d6b5c8b3d 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_object_with_enum_property.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/outer_object_with_enum_property.dart
@@ -26,7 +26,8 @@ class OuterObjectWithEnumProperty {
     
     name: r'value',
     required: true,
-    includeIfNull: false
+    includeIfNull: false,
+  unknownEnumValue: OuterEnumInteger.unknownDefaultOpenApi,
   )
 
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/parent_with_nullable.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/parent_with_nullable.dart
index 3496af6f6c3a..bda5847df5ad 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/parent_with_nullable.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/parent_with_nullable.dart
@@ -27,7 +27,8 @@ class ParentWithNullable {
     
     name: r'type',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
+  unknownEnumValue: ParentWithNullableTypeEnum.unknownDefaultOpenApi,
   )
 
 
@@ -39,7 +40,7 @@ class ParentWithNullable {
     
     name: r'nullableProperty',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/pet.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/pet.dart
index 8a7ac6ad6354..fdb70f9ce89a 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/pet.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/pet.dart
@@ -37,7 +37,7 @@ class Pet {
     
     name: r'id',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -49,7 +49,7 @@ class Pet {
     
     name: r'category',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -61,7 +61,7 @@ class Pet {
     
     name: r'name',
     required: true,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -73,7 +73,7 @@ class Pet {
     
     name: r'photoUrls',
     required: true,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -85,7 +85,7 @@ class Pet {
     
     name: r'tags',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -98,7 +98,8 @@ class Pet {
     
     name: r'status',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
+  unknownEnumValue: PetStatusEnum.unknownDefaultOpenApi,
   )
 
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/read_only_first.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/read_only_first.dart
index 0a57599c7c3a..0ec8a7710c60 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/read_only_first.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/read_only_first.dart
@@ -27,7 +27,7 @@ class ReadOnlyFirst {
     
     name: r'bar',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -39,7 +39,7 @@ class ReadOnlyFirst {
     
     name: r'baz',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/special_model_name.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/special_model_name.dart
index d3a033358f8c..175b6fb274ce 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/special_model_name.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/special_model_name.dart
@@ -25,7 +25,7 @@ class SpecialModelName {
     
     name: r'$special[property.name]',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/tag.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/tag.dart
index 00c6ff8cb702..abe588b27d6f 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/tag.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/tag.dart
@@ -27,7 +27,7 @@ class Tag {
     
     name: r'id',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -39,7 +39,7 @@ class Tag {
     
     name: r'name',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/test_inline_freeform_additional_properties_request.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/test_inline_freeform_additional_properties_request.dart
index 8f5947509baa..5eda7d48b384 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/test_inline_freeform_additional_properties_request.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/test_inline_freeform_additional_properties_request.dart
@@ -25,7 +25,7 @@ class TestInlineFreeformAdditionalPropertiesRequest {
     
     name: r'someProperty',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/user.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/user.dart
index 44a437d51349..56c95cb75f15 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/user.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake-json_serializable/lib/src/model/user.dart
@@ -39,7 +39,7 @@ class User {
     
     name: r'id',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -51,7 +51,7 @@ class User {
     
     name: r'username',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -63,7 +63,7 @@ class User {
     
     name: r'firstName',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -75,7 +75,7 @@ class User {
     
     name: r'lastName',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -87,7 +87,7 @@ class User {
     
     name: r'email',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -99,7 +99,7 @@ class User {
     
     name: r'password',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -111,7 +111,7 @@ class User {
     
     name: r'phone',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )
 
 
@@ -124,7 +124,7 @@ class User {
     
     name: r'userStatus',
     required: false,
-    includeIfNull: false
+    includeIfNull: false,
   )