diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/doc/InlineObject.md b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/doc/InlineObject.md
deleted file mode 100644
index 9aa480dee58..00000000000
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/doc/InlineObject.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# openapi.model.InlineObject
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**name** | **String** | Updated name of the pet | [optional] 
-**status** | **String** | Updated status of the pet | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/doc/InlineObject1.md b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/doc/InlineObject1.md
deleted file mode 100644
index 89db64f1214..00000000000
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/doc/InlineObject1.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# openapi.model.InlineObject1
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**additionalMetadata** | **String** | Additional data to pass to server | [optional] 
-**file** | [**Uint8List**](Uint8List.md) | file to upload | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/lib/model/inline_object.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/lib/model/inline_object.dart
deleted file mode 100644
index fb32b70cfa0..00000000000
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/lib/model/inline_object.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-import 'package:built_value/built_value.dart';
-import 'package:built_value/serializer.dart';
-
-part 'inline_object.g.dart';
-
-abstract class InlineObject implements Built<InlineObject, InlineObjectBuilder> {
-
-    /// Updated name of the pet
-    @nullable
-    @BuiltValueField(wireName: r'name')
-    String get name;
-
-    /// Updated status of the pet
-    @nullable
-    @BuiltValueField(wireName: r'status')
-    String get status;
-
-    // Boilerplate code needed to wire-up generated code
-    InlineObject._();
-
-    static void _initializeBuilder(InlineObjectBuilder b) => b;
-
-    factory InlineObject([void updates(InlineObjectBuilder b)]) = _$InlineObject;
-    static Serializer<InlineObject> get serializer => _$inlineObjectSerializer;
-}
-
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/lib/model/inline_object1.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/lib/model/inline_object1.dart
deleted file mode 100644
index 73064295609..00000000000
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/lib/model/inline_object1.dart
+++ /dev/null
@@ -1,27 +0,0 @@
-import 'dart:typed_data';
-import 'package:built_value/built_value.dart';
-import 'package:built_value/serializer.dart';
-
-part 'inline_object1.g.dart';
-
-abstract class InlineObject1 implements Built<InlineObject1, InlineObject1Builder> {
-
-    /// Additional data to pass to server
-    @nullable
-    @BuiltValueField(wireName: r'additionalMetadata')
-    String get additionalMetadata;
-
-    /// file to upload
-    @nullable
-    @BuiltValueField(wireName: r'file')
-    Uint8List get file;
-
-    // Boilerplate code needed to wire-up generated code
-    InlineObject1._();
-
-    static void _initializeBuilder(InlineObject1Builder b) => b;
-
-    factory InlineObject1([void updates(InlineObject1Builder b)]) = _$InlineObject1;
-    static Serializer<InlineObject1> get serializer => _$inlineObject1Serializer;
-}
-
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/test/api_response_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/test/api_response_test.dart
index d80b2976160..39d3ffc2941 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/test/api_response_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/test/api_response_test.dart
@@ -6,17 +6,17 @@ void main() {
   final instance = ApiResponse();
 
   group(ApiResponse, () {
-    // int code (default value: null)
+    // int code
     test('to test the property `code`', () async {
       // TODO
     });
 
-    // String type (default value: null)
+    // String type
     test('to test the property `type`', () async {
       // TODO
     });
 
-    // String message (default value: null)
+    // String message
     test('to test the property `message`', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/test/category_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/test/category_test.dart
index 571e020bf63..cf8f893d513 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/test/category_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/test/category_test.dart
@@ -6,12 +6,12 @@ void main() {
   final instance = Category();
 
   group(Category, () {
-    // int id (default value: null)
+    // int id
     test('to test the property `id`', () async {
       // TODO
     });
 
-    // String name (default value: null)
+    // String name
     test('to test the property `name`', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/test/order_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/test/order_test.dart
index ea9ac6e14eb..25b2cc396f3 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/test/order_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/test/order_test.dart
@@ -6,28 +6,28 @@ void main() {
   final instance = Order();
 
   group(Order, () {
-    // int id (default value: null)
+    // int id
     test('to test the property `id`', () async {
       // TODO
     });
 
-    // int petId (default value: null)
+    // int petId
     test('to test the property `petId`', () async {
       // TODO
     });
 
-    // int quantity (default value: null)
+    // int quantity
     test('to test the property `quantity`', () async {
       // TODO
     });
 
-    // DateTime shipDate (default value: null)
+    // DateTime shipDate
     test('to test the property `shipDate`', () async {
       // TODO
     });
 
     // Order Status
-    // String status (default value: null)
+    // String status
     test('to test the property `status`', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/test/pet_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/test/pet_test.dart
index 63cfc070e93..9d5b6e4dd4a 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/test/pet_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/test/pet_test.dart
@@ -6,33 +6,33 @@ void main() {
   final instance = Pet();
 
   group(Pet, () {
-    // int id (default value: null)
+    // int id
     test('to test the property `id`', () async {
       // TODO
     });
 
-    // Category category (default value: null)
+    // Category category
     test('to test the property `category`', () async {
       // TODO
     });
 
-    // String name (default value: null)
+    // String name
     test('to test the property `name`', () async {
       // TODO
     });
 
-    // BuiltList<String> photoUrls (default value: const [])
+    // BuiltList<String> photoUrls
     test('to test the property `photoUrls`', () async {
       // TODO
     });
 
-    // BuiltList<Tag> tags (default value: const [])
+    // BuiltList<Tag> tags
     test('to test the property `tags`', () async {
       // TODO
     });
 
     // pet status in the store
-    // String status (default value: null)
+    // String status
     test('to test the property `status`', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/test/tag_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/test/tag_test.dart
index c2757a71863..0dbda6e4986 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/test/tag_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/test/tag_test.dart
@@ -6,12 +6,12 @@ void main() {
   final instance = Tag();
 
   group(Tag, () {
-    // int id (default value: null)
+    // int id
     test('to test the property `id`', () async {
       // TODO
     });
 
-    // String name (default value: null)
+    // String name
     test('to test the property `name`', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/test/user_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/test/user_test.dart
index b598e7f7fef..09e720b625c 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/test/user_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib/test/user_test.dart
@@ -6,43 +6,43 @@ void main() {
   final instance = User();
 
   group(User, () {
-    // int id (default value: null)
+    // int id
     test('to test the property `id`', () async {
       // TODO
     });
 
-    // String username (default value: null)
+    // String username
     test('to test the property `username`', () async {
       // TODO
     });
 
-    // String firstName (default value: null)
+    // String firstName
     test('to test the property `firstName`', () async {
       // TODO
     });
 
-    // String lastName (default value: null)
+    // String lastName
     test('to test the property `lastName`', () async {
       // TODO
     });
 
-    // String email (default value: null)
+    // String email
     test('to test the property `email`', () async {
       // TODO
     });
 
-    // String password (default value: null)
+    // String password
     test('to test the property `password`', () async {
       // TODO
     });
 
-    // String phone (default value: null)
+    // String phone
     test('to test the property `phone`', () async {
       // TODO
     });
 
     // User Status
-    // int userStatus (default value: null)
+    // int userStatus
     test('to test the property `userStatus`', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/InlineObject.md b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/InlineObject.md
deleted file mode 100644
index 9aa480dee58..00000000000
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/InlineObject.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# openapi.model.InlineObject
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**name** | **String** | Updated name of the pet | [optional] 
-**status** | **String** | Updated status of the pet | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/InlineObject1.md b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/InlineObject1.md
deleted file mode 100644
index 89db64f1214..00000000000
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/InlineObject1.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# openapi.model.InlineObject1
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**additionalMetadata** | **String** | Additional data to pass to server | [optional] 
-**file** | [**Uint8List**](Uint8List.md) | file to upload | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/InlineObject2.md b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/InlineObject2.md
deleted file mode 100644
index 7bea7e9566e..00000000000
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/InlineObject2.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# openapi.model.InlineObject2
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**enumFormStringArray** | **BuiltList<String>** | Form parameter enum test (string array) | [optional] 
-**enumFormString** | **String** | Form parameter enum test (string) | [optional] [default to '-efg']
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/InlineObject3.md b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/InlineObject3.md
deleted file mode 100644
index a8915eb5d38..00000000000
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/InlineObject3.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# openapi.model.InlineObject3
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**integer** | **int** | None | [optional] 
-**int32** | **int** | None | [optional] 
-**int64** | **int** | None | [optional] 
-**number** | **num** | None | 
-**float** | **double** | None | [optional] 
-**double_** | **double** | None | 
-**string** | **String** | None | [optional] 
-**patternWithoutDelimiter** | **String** | None | 
-**byte** | **String** | None | 
-**binary** | [**Uint8List**](Uint8List.md) | None | [optional] 
-**date** | [**DateTime**](DateTime.md) | None | [optional] 
-**dateTime** | [**DateTime**](DateTime.md) | None | [optional] 
-**password** | **String** | None | [optional] 
-**callback** | **String** | None | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/InlineObject4.md b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/InlineObject4.md
deleted file mode 100644
index 3823ffff979..00000000000
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/InlineObject4.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# openapi.model.InlineObject4
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**param** | **String** | field1 | 
-**param2** | **String** | field2 | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/InlineObject5.md b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/InlineObject5.md
deleted file mode 100644
index e5daf8da8a1..00000000000
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/doc/InlineObject5.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# openapi.model.InlineObject5
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**additionalMetadata** | **String** | Additional data to pass to server | [optional] 
-**requiredFile** | [**Uint8List**](Uint8List.md) | file to upload | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/model/inline_object.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/model/inline_object.dart
deleted file mode 100644
index fb32b70cfa0..00000000000
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/model/inline_object.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-import 'package:built_value/built_value.dart';
-import 'package:built_value/serializer.dart';
-
-part 'inline_object.g.dart';
-
-abstract class InlineObject implements Built<InlineObject, InlineObjectBuilder> {
-
-    /// Updated name of the pet
-    @nullable
-    @BuiltValueField(wireName: r'name')
-    String get name;
-
-    /// Updated status of the pet
-    @nullable
-    @BuiltValueField(wireName: r'status')
-    String get status;
-
-    // Boilerplate code needed to wire-up generated code
-    InlineObject._();
-
-    static void _initializeBuilder(InlineObjectBuilder b) => b;
-
-    factory InlineObject([void updates(InlineObjectBuilder b)]) = _$InlineObject;
-    static Serializer<InlineObject> get serializer => _$inlineObjectSerializer;
-}
-
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/model/inline_object1.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/model/inline_object1.dart
deleted file mode 100644
index 73064295609..00000000000
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/model/inline_object1.dart
+++ /dev/null
@@ -1,27 +0,0 @@
-import 'dart:typed_data';
-import 'package:built_value/built_value.dart';
-import 'package:built_value/serializer.dart';
-
-part 'inline_object1.g.dart';
-
-abstract class InlineObject1 implements Built<InlineObject1, InlineObject1Builder> {
-
-    /// Additional data to pass to server
-    @nullable
-    @BuiltValueField(wireName: r'additionalMetadata')
-    String get additionalMetadata;
-
-    /// file to upload
-    @nullable
-    @BuiltValueField(wireName: r'file')
-    Uint8List get file;
-
-    // Boilerplate code needed to wire-up generated code
-    InlineObject1._();
-
-    static void _initializeBuilder(InlineObject1Builder b) => b;
-
-    factory InlineObject1([void updates(InlineObject1Builder b)]) = _$InlineObject1;
-    static Serializer<InlineObject1> get serializer => _$inlineObject1Serializer;
-}
-
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/model/inline_object2.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/model/inline_object2.dart
deleted file mode 100644
index e402d332c29..00000000000
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/model/inline_object2.dart
+++ /dev/null
@@ -1,65 +0,0 @@
-import 'package:built_collection/built_collection.dart';
-import 'package:built_value/built_value.dart';
-import 'package:built_value/serializer.dart';
-
-part 'inline_object2.g.dart';
-
-abstract class InlineObject2 implements Built<InlineObject2, InlineObject2Builder> {
-
-    /// Form parameter enum test (string array)
-    @nullable
-    @BuiltValueField(wireName: r'enum_form_string_array')
-    BuiltList<InlineObject2EnumFormStringArrayEnum> get enumFormStringArray;
-    // enum enumFormStringArrayEnum {  >,  $,  };
-
-    /// Form parameter enum test (string)
-    @nullable
-    @BuiltValueField(wireName: r'enum_form_string')
-    InlineObject2EnumFormStringEnum get enumFormString;
-    // enum enumFormStringEnum {  _abc,  -efg,  (xyz),  };
-
-    // Boilerplate code needed to wire-up generated code
-    InlineObject2._();
-
-    static void _initializeBuilder(InlineObject2Builder b) => b
-        ..enumFormString = const InlineObject2EnumFormStringEnum._('-efg');
-
-    factory InlineObject2([void updates(InlineObject2Builder b)]) = _$InlineObject2;
-    static Serializer<InlineObject2> get serializer => _$inlineObject2Serializer;
-}
-
-class InlineObject2EnumFormStringArrayEnum extends EnumClass {
-
-  @BuiltValueEnumConst(wireName: r'>')
-  static const InlineObject2EnumFormStringArrayEnum greaterThan = _$inlineObject2EnumFormStringArrayEnum_greaterThan;
-  @BuiltValueEnumConst(wireName: r'\$')
-  static const InlineObject2EnumFormStringArrayEnum dollar = _$inlineObject2EnumFormStringArrayEnum_dollar;
-
-  static Serializer<InlineObject2EnumFormStringArrayEnum> get serializer => _$inlineObject2EnumFormStringArrayEnumSerializer;
-
-  const InlineObject2EnumFormStringArrayEnum._(String name): super(name);
-
-  static BuiltSet<InlineObject2EnumFormStringArrayEnum> get values => _$inlineObject2EnumFormStringArrayEnumValues;
-  static InlineObject2EnumFormStringArrayEnum valueOf(String name) => _$inlineObject2EnumFormStringArrayEnumValueOf(name);
-}
-
-class InlineObject2EnumFormStringEnum extends EnumClass {
-
-  /// Form parameter enum test (string)
-  @BuiltValueEnumConst(wireName: r'_abc')
-  static const InlineObject2EnumFormStringEnum abc = _$inlineObject2EnumFormStringEnum_abc;
-  /// Form parameter enum test (string)
-  @BuiltValueEnumConst(wireName: r'-efg')
-  static const InlineObject2EnumFormStringEnum efg = _$inlineObject2EnumFormStringEnum_efg;
-  /// Form parameter enum test (string)
-  @BuiltValueEnumConst(wireName: r'(xyz)')
-  static const InlineObject2EnumFormStringEnum leftParenthesisXyzRightParenthesis = _$inlineObject2EnumFormStringEnum_leftParenthesisXyzRightParenthesis;
-
-  static Serializer<InlineObject2EnumFormStringEnum> get serializer => _$inlineObject2EnumFormStringEnumSerializer;
-
-  const InlineObject2EnumFormStringEnum._(String name): super(name);
-
-  static BuiltSet<InlineObject2EnumFormStringEnum> get values => _$inlineObject2EnumFormStringEnumValues;
-  static InlineObject2EnumFormStringEnum valueOf(String name) => _$inlineObject2EnumFormStringEnumValueOf(name);
-}
-
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/model/inline_object3.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/model/inline_object3.dart
deleted file mode 100644
index a982efff248..00000000000
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/model/inline_object3.dart
+++ /dev/null
@@ -1,87 +0,0 @@
-import 'dart:typed_data';
-import 'package:built_value/built_value.dart';
-import 'package:built_value/serializer.dart';
-
-part 'inline_object3.g.dart';
-
-abstract class InlineObject3 implements Built<InlineObject3, InlineObject3Builder> {
-
-    /// None
-    @nullable
-    @BuiltValueField(wireName: r'integer')
-    int get integer;
-
-    /// None
-    @nullable
-    @BuiltValueField(wireName: r'int32')
-    int get int32;
-
-    /// None
-    @nullable
-    @BuiltValueField(wireName: r'int64')
-    int get int64;
-
-    /// None
-    @nullable
-    @BuiltValueField(wireName: r'number')
-    num get number;
-
-    /// None
-    @nullable
-    @BuiltValueField(wireName: r'float')
-    double get float;
-
-    /// None
-    @nullable
-    @BuiltValueField(wireName: r'double')
-    double get double_;
-
-    /// None
-    @nullable
-    @BuiltValueField(wireName: r'string')
-    String get string;
-
-    /// None
-    @nullable
-    @BuiltValueField(wireName: r'pattern_without_delimiter')
-    String get patternWithoutDelimiter;
-
-    /// None
-    @nullable
-    @BuiltValueField(wireName: r'byte')
-    String get byte;
-
-    /// None
-    @nullable
-    @BuiltValueField(wireName: r'binary')
-    Uint8List get binary;
-
-    /// None
-    @nullable
-    @BuiltValueField(wireName: r'date')
-    DateTime get date;
-
-    /// None
-    @nullable
-    @BuiltValueField(wireName: r'dateTime')
-    DateTime get dateTime;
-
-    /// None
-    @nullable
-    @BuiltValueField(wireName: r'password')
-    String get password;
-
-    /// None
-    @nullable
-    @BuiltValueField(wireName: r'callback')
-    String get callback;
-
-    // Boilerplate code needed to wire-up generated code
-    InlineObject3._();
-
-    static void _initializeBuilder(InlineObject3Builder b) => b;
-
-    factory InlineObject3([void updates(InlineObject3Builder b)]) = _$InlineObject3;
-    static Serializer<InlineObject3> get serializer => _$inlineObject3Serializer;
-}
-
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/model/inline_object4.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/model/inline_object4.dart
deleted file mode 100644
index 3a108a74879..00000000000
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/model/inline_object4.dart
+++ /dev/null
@@ -1,26 +0,0 @@
-import 'package:built_value/built_value.dart';
-import 'package:built_value/serializer.dart';
-
-part 'inline_object4.g.dart';
-
-abstract class InlineObject4 implements Built<InlineObject4, InlineObject4Builder> {
-
-    /// field1
-    @nullable
-    @BuiltValueField(wireName: r'param')
-    String get param;
-
-    /// field2
-    @nullable
-    @BuiltValueField(wireName: r'param2')
-    String get param2;
-
-    // Boilerplate code needed to wire-up generated code
-    InlineObject4._();
-
-    static void _initializeBuilder(InlineObject4Builder b) => b;
-
-    factory InlineObject4([void updates(InlineObject4Builder b)]) = _$InlineObject4;
-    static Serializer<InlineObject4> get serializer => _$inlineObject4Serializer;
-}
-
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/model/inline_object5.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/model/inline_object5.dart
deleted file mode 100644
index bfe53d5d417..00000000000
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/lib/model/inline_object5.dart
+++ /dev/null
@@ -1,27 +0,0 @@
-import 'dart:typed_data';
-import 'package:built_value/built_value.dart';
-import 'package:built_value/serializer.dart';
-
-part 'inline_object5.g.dart';
-
-abstract class InlineObject5 implements Built<InlineObject5, InlineObject5Builder> {
-
-    /// Additional data to pass to server
-    @nullable
-    @BuiltValueField(wireName: r'additionalMetadata')
-    String get additionalMetadata;
-
-    /// file to upload
-    @nullable
-    @BuiltValueField(wireName: r'requiredFile')
-    Uint8List get requiredFile;
-
-    // Boilerplate code needed to wire-up generated code
-    InlineObject5._();
-
-    static void _initializeBuilder(InlineObject5Builder b) => b;
-
-    factory InlineObject5([void updates(InlineObject5Builder b)]) = _$InlineObject5;
-    static Serializer<InlineObject5> get serializer => _$inlineObject5Serializer;
-}
-
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/additional_properties_class_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/additional_properties_class_test.dart
index cf1888a7461..81db250160d 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/additional_properties_class_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/additional_properties_class_test.dart
@@ -6,12 +6,12 @@ void main() {
   final instance = AdditionalPropertiesClass();
 
   group(AdditionalPropertiesClass, () {
-    // BuiltMap<String, String> mapProperty (default value: const {})
+    // BuiltMap<String, String> mapProperty
     test('to test the property `mapProperty`', () async {
       // TODO
     });
 
-    // BuiltMap<String, BuiltMap<String, String>> mapOfMapProperty (default value: const {})
+    // BuiltMap<String, BuiltMap<String, String>> mapOfMapProperty
     test('to test the property `mapOfMapProperty`', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/animal_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/animal_test.dart
index bae2d856b6c..d1fd66cefbe 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/animal_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/animal_test.dart
@@ -6,7 +6,7 @@ void main() {
   final instance = Animal();
 
   group(Animal, () {
-    // String className (default value: null)
+    // String className
     test('to test the property `className`', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/another_fake_api_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/another_fake_api_test.dart
index af0d198a0b6..e302c7b0e50 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/another_fake_api_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/another_fake_api_test.dart
@@ -12,7 +12,7 @@ void main() {
     //
     // To test special tags and operation ID starting with number
     //
-    //Future<Client> call123testSpecialTags(Client client) async
+    //Future<ModelClient> call123testSpecialTags(ModelClient modelClient) async
     test('test call123testSpecialTags', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/api_response_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/api_response_test.dart
index d80b2976160..39d3ffc2941 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/api_response_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/api_response_test.dart
@@ -6,17 +6,17 @@ void main() {
   final instance = ApiResponse();
 
   group(ApiResponse, () {
-    // int code (default value: null)
+    // int code
     test('to test the property `code`', () async {
       // TODO
     });
 
-    // String type (default value: null)
+    // String type
     test('to test the property `type`', () async {
       // TODO
     });
 
-    // String message (default value: null)
+    // String message
     test('to test the property `message`', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/array_of_array_of_number_only_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/array_of_array_of_number_only_test.dart
index e7384400a22..6d4f7c31fde 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/array_of_array_of_number_only_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/array_of_array_of_number_only_test.dart
@@ -6,7 +6,7 @@ void main() {
   final instance = ArrayOfArrayOfNumberOnly();
 
   group(ArrayOfArrayOfNumberOnly, () {
-    // BuiltList<BuiltList<num>> arrayArrayNumber (default value: const [])
+    // BuiltList<BuiltList<num>> arrayArrayNumber
     test('to test the property `arrayArrayNumber`', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/array_of_number_only_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/array_of_number_only_test.dart
index f40a137a8d2..4a34a792ec3 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/array_of_number_only_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/array_of_number_only_test.dart
@@ -6,7 +6,7 @@ void main() {
   final instance = ArrayOfNumberOnly();
 
   group(ArrayOfNumberOnly, () {
-    // BuiltList<num> arrayNumber (default value: const [])
+    // BuiltList<num> arrayNumber
     test('to test the property `arrayNumber`', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/array_test_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/array_test_test.dart
index f8059a850cc..0c53feccd9a 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/array_test_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/array_test_test.dart
@@ -6,17 +6,17 @@ void main() {
   final instance = ArrayTest();
 
   group(ArrayTest, () {
-    // BuiltList<String> arrayOfString (default value: const [])
+    // BuiltList<String> arrayOfString
     test('to test the property `arrayOfString`', () async {
       // TODO
     });
 
-    // BuiltList<BuiltList<int>> arrayArrayOfInteger (default value: const [])
+    // BuiltList<BuiltList<int>> arrayArrayOfInteger
     test('to test the property `arrayArrayOfInteger`', () async {
       // TODO
     });
 
-    // BuiltList<BuiltList<ReadOnlyFirst>> arrayArrayOfModel (default value: const [])
+    // BuiltList<BuiltList<ReadOnlyFirst>> arrayArrayOfModel
     test('to test the property `arrayArrayOfModel`', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/capitalization_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/capitalization_test.dart
index 304df4d82af..0775e8d2756 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/capitalization_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/capitalization_test.dart
@@ -6,33 +6,33 @@ void main() {
   final instance = Capitalization();
 
   group(Capitalization, () {
-    // String smallCamel (default value: null)
+    // String smallCamel
     test('to test the property `smallCamel`', () async {
       // TODO
     });
 
-    // String capitalCamel (default value: null)
+    // String capitalCamel
     test('to test the property `capitalCamel`', () async {
       // TODO
     });
 
-    // String smallSnake (default value: null)
+    // String smallSnake
     test('to test the property `smallSnake`', () async {
       // TODO
     });
 
-    // String capitalSnake (default value: null)
+    // String capitalSnake
     test('to test the property `capitalSnake`', () async {
       // TODO
     });
 
-    // String sCAETHFlowPoints (default value: null)
+    // String sCAETHFlowPoints
     test('to test the property `sCAETHFlowPoints`', () async {
       // TODO
     });
 
     // Name of the pet 
-    // String ATT_NAME (default value: null)
+    // String ATT_NAME
     test('to test the property `ATT_NAME`', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/cat_all_of_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/cat_all_of_test.dart
index b8e84359a30..460577b0234 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/cat_all_of_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/cat_all_of_test.dart
@@ -6,7 +6,7 @@ void main() {
   final instance = CatAllOf();
 
   group(CatAllOf, () {
-    // bool declawed (default value: null)
+    // bool declawed
     test('to test the property `declawed`', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/cat_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/cat_test.dart
index a066e555492..05c2b79badb 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/cat_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/cat_test.dart
@@ -6,7 +6,7 @@ void main() {
   final instance = Cat();
 
   group(Cat, () {
-    // String className (default value: null)
+    // String className
     test('to test the property `className`', () async {
       // TODO
     });
@@ -16,7 +16,7 @@ void main() {
       // TODO
     });
 
-    // bool declawed (default value: null)
+    // bool declawed
     test('to test the property `declawed`', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/category_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/category_test.dart
index 4ef34fea723..fc2c1ecb46e 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/category_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/category_test.dart
@@ -6,7 +6,7 @@ void main() {
   final instance = Category();
 
   group(Category, () {
-    // int id (default value: null)
+    // int id
     test('to test the property `id`', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/class_model_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/class_model_test.dart
index d8daf6f70dd..af5ab7492c7 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/class_model_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/class_model_test.dart
@@ -6,7 +6,7 @@ void main() {
   final instance = ClassModel();
 
   group(ClassModel, () {
-    // String class_ (default value: null)
+    // String class_
     test('to test the property `class_`', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/dog_all_of_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/dog_all_of_test.dart
index 4f208c95b6f..f7bed7fdebf 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/dog_all_of_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/dog_all_of_test.dart
@@ -6,7 +6,7 @@ void main() {
   final instance = DogAllOf();
 
   group(DogAllOf, () {
-    // String breed (default value: null)
+    // String breed
     test('to test the property `breed`', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/dog_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/dog_test.dart
index 6042386f178..4daa11323da 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/dog_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/dog_test.dart
@@ -6,7 +6,7 @@ void main() {
   final instance = Dog();
 
   group(Dog, () {
-    // String className (default value: null)
+    // String className
     test('to test the property `className`', () async {
       // TODO
     });
@@ -16,7 +16,7 @@ void main() {
       // TODO
     });
 
-    // String breed (default value: null)
+    // String breed
     test('to test the property `breed`', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/enum_arrays_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/enum_arrays_test.dart
index 5c8b0da4c05..3aa0e621f79 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/enum_arrays_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/enum_arrays_test.dart
@@ -6,12 +6,12 @@ void main() {
   final instance = EnumArrays();
 
   group(EnumArrays, () {
-    // String justSymbol (default value: null)
+    // String justSymbol
     test('to test the property `justSymbol`', () async {
       // TODO
     });
 
-    // BuiltList<String> arrayEnum (default value: const [])
+    // BuiltList<String> arrayEnum
     test('to test the property `arrayEnum`', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/enum_test_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/enum_test_test.dart
index 3565cb937a0..8d963d1eead 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/enum_test_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/enum_test_test.dart
@@ -6,42 +6,42 @@ void main() {
   final instance = EnumTest();
 
   group(EnumTest, () {
-    // String enumString (default value: null)
+    // String enumString
     test('to test the property `enumString`', () async {
       // TODO
     });
 
-    // String enumStringRequired (default value: null)
+    // String enumStringRequired
     test('to test the property `enumStringRequired`', () async {
       // TODO
     });
 
-    // int enumInteger (default value: null)
+    // int enumInteger
     test('to test the property `enumInteger`', () async {
       // TODO
     });
 
-    // double enumNumber (default value: null)
+    // double enumNumber
     test('to test the property `enumNumber`', () async {
       // TODO
     });
 
-    // OuterEnum outerEnum (default value: null)
+    // OuterEnum outerEnum
     test('to test the property `outerEnum`', () async {
       // TODO
     });
 
-    // OuterEnumInteger outerEnumInteger (default value: null)
+    // OuterEnumInteger outerEnumInteger
     test('to test the property `outerEnumInteger`', () async {
       // TODO
     });
 
-    // OuterEnumDefaultValue outerEnumDefaultValue (default value: null)
+    // OuterEnumDefaultValue outerEnumDefaultValue
     test('to test the property `outerEnumDefaultValue`', () async {
       // TODO
     });
 
-    // OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue (default value: null)
+    // OuterEnumIntegerDefaultValue outerEnumIntegerDefaultValue
     test('to test the property `outerEnumIntegerDefaultValue`', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/fake_api_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/fake_api_test.dart
index 0ffe770cdd4..06ed48d6989 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/fake_api_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/fake_api_test.dart
@@ -66,7 +66,7 @@ void main() {
     //
     // To test \"client\" model
     //
-    //Future<Client> testClientModel(Client client) async
+    //Future<ModelClient> testClientModel(ModelClient modelClient) async
     test('test testClientModel', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/fake_classname_tags123_api_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/fake_classname_tags123_api_test.dart
index b13dc103ba1..510961f8602 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/fake_classname_tags123_api_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/fake_classname_tags123_api_test.dart
@@ -12,7 +12,7 @@ void main() {
     //
     // To test class name in snake case
     //
-    //Future<Client> testClassname(Client client) async
+    //Future<ModelClient> testClassname(ModelClient modelClient) async
     test('test testClassname', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/file_schema_test_class_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/file_schema_test_class_test.dart
index 3dac8bab3af..fcab730f1d5 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/file_schema_test_class_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/file_schema_test_class_test.dart
@@ -6,12 +6,12 @@ void main() {
   final instance = FileSchemaTestClass();
 
   group(FileSchemaTestClass, () {
-    // MultipartFile file (default value: null)
+    // ModelFile file
     test('to test the property `file`', () async {
       // TODO
     });
 
-    // BuiltList<MultipartFile> files (default value: const [])
+    // BuiltList<ModelFile> files
     test('to test the property `files`', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/format_test_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/format_test_test.dart
index 5630c432b68..1b56b04d4c8 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/format_test_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/format_test_test.dart
@@ -6,84 +6,84 @@ void main() {
   final instance = FormatTest();
 
   group(FormatTest, () {
-    // int integer (default value: null)
+    // int integer
     test('to test the property `integer`', () async {
       // TODO
     });
 
-    // int int32 (default value: null)
+    // int int32
     test('to test the property `int32`', () async {
       // TODO
     });
 
-    // int int64 (default value: null)
+    // int int64
     test('to test the property `int64`', () async {
       // TODO
     });
 
-    // num number (default value: null)
+    // num number
     test('to test the property `number`', () async {
       // TODO
     });
 
-    // double float (default value: null)
+    // double float
     test('to test the property `float`', () async {
       // TODO
     });
 
-    // double double_ (default value: null)
+    // double double_
     test('to test the property `double_`', () async {
       // TODO
     });
 
-    // double decimal (default value: null)
+    // double decimal
     test('to test the property `decimal`', () async {
       // TODO
     });
 
-    // String string (default value: null)
+    // String string
     test('to test the property `string`', () async {
       // TODO
     });
 
-    // String byte (default value: null)
+    // String byte
     test('to test the property `byte`', () async {
       // TODO
     });
 
-    // Uint8List binary (default value: null)
+    // Uint8List binary
     test('to test the property `binary`', () async {
       // TODO
     });
 
-    // DateTime date (default value: null)
+    // DateTime date
     test('to test the property `date`', () async {
       // TODO
     });
 
-    // DateTime dateTime (default value: null)
+    // DateTime dateTime
     test('to test the property `dateTime`', () async {
       // TODO
     });
 
-    // String uuid (default value: null)
+    // String uuid
     test('to test the property `uuid`', () async {
       // TODO
     });
 
-    // String password (default value: null)
+    // String password
     test('to test the property `password`', () async {
       // TODO
     });
 
     // A string that is a 10 digit number. Can have leading zeros.
-    // String patternWithDigits (default value: null)
+    // String patternWithDigits
     test('to test the property `patternWithDigits`', () async {
       // TODO
     });
 
     // A string starting with 'image_' (case insensitive) and one to three digits following i.e. Image_01.
-    // String patternWithDigitsAndDelimiter (default value: null)
+    // String patternWithDigitsAndDelimiter
     test('to test the property `patternWithDigitsAndDelimiter`', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/has_only_read_only_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/has_only_read_only_test.dart
index 4a6bfc857dd..2556caff31f 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/has_only_read_only_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/has_only_read_only_test.dart
@@ -6,12 +6,12 @@ void main() {
   final instance = HasOnlyReadOnly();
 
   group(HasOnlyReadOnly, () {
-    // String bar (default value: null)
+    // String bar
     test('to test the property `bar`', () async {
       // TODO
     });
 
-    // String foo (default value: null)
+    // String foo
     test('to test the property `foo`', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/health_check_result_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/health_check_result_test.dart
index fb5896b660d..81960b87ce8 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/health_check_result_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/health_check_result_test.dart
@@ -6,7 +6,7 @@ void main() {
   final instance = HealthCheckResult();
 
   group(HealthCheckResult, () {
-    // String nullableMessage (default value: null)
+    // String nullableMessage
     test('to test the property `nullableMessage`', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/inline_response_default_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/inline_response_default_test.dart
index acf32ff97f9..cae92c3385e 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/inline_response_default_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/inline_response_default_test.dart
@@ -6,7 +6,7 @@ void main() {
   final instance = InlineResponseDefault();
 
   group(InlineResponseDefault, () {
-    // Foo string (default value: null)
+    // Foo string
     test('to test the property `string`', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/map_test_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/map_test_test.dart
index 90d2efc8805..ed5f45ce721 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/map_test_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/map_test_test.dart
@@ -6,22 +6,22 @@ void main() {
   final instance = MapTest();
 
   group(MapTest, () {
-    // BuiltMap<String, BuiltMap<String, String>> mapMapOfString (default value: const {})
+    // BuiltMap<String, BuiltMap<String, String>> mapMapOfString
     test('to test the property `mapMapOfString`', () async {
       // TODO
     });
 
-    // BuiltMap<String, String> mapOfEnumString (default value: const {})
+    // BuiltMap<String, String> mapOfEnumString
     test('to test the property `mapOfEnumString`', () async {
       // TODO
     });
 
-    // BuiltMap<String, bool> directMap (default value: const {})
+    // BuiltMap<String, bool> directMap
     test('to test the property `directMap`', () async {
       // TODO
     });
 
-    // BuiltMap<String, bool> indirectMap (default value: const {})
+    // BuiltMap<String, bool> indirectMap
     test('to test the property `indirectMap`', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/mixed_properties_and_additional_properties_class_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/mixed_properties_and_additional_properties_class_test.dart
index 5e545881931..cc36b6e7dd3 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/mixed_properties_and_additional_properties_class_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/mixed_properties_and_additional_properties_class_test.dart
@@ -6,17 +6,17 @@ void main() {
   final instance = MixedPropertiesAndAdditionalPropertiesClass();
 
   group(MixedPropertiesAndAdditionalPropertiesClass, () {
-    // String uuid (default value: null)
+    // String uuid
     test('to test the property `uuid`', () async {
       // TODO
     });
 
-    // DateTime dateTime (default value: null)
+    // DateTime dateTime
     test('to test the property `dateTime`', () async {
       // TODO
     });
 
-    // BuiltMap<String, Animal> map (default value: const {})
+    // BuiltMap<String, Animal> map
     test('to test the property `map`', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/model200_response_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/model200_response_test.dart
index 8d91a2fb850..6b77b5481b6 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/model200_response_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/model200_response_test.dart
@@ -6,12 +6,12 @@ void main() {
   final instance = Model200Response();
 
   group(Model200Response, () {
-    // int name (default value: null)
+    // int name
     test('to test the property `name`', () async {
       // TODO
     });
 
-    // String class_ (default value: null)
+    // String class_
     test('to test the property `class_`', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/model_client_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/model_client_test.dart
index d428e9ccfe7..c3908d24b92 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/model_client_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/model_client_test.dart
@@ -6,7 +6,7 @@ void main() {
   final instance = ModelClient();
 
   group(ModelClient, () {
-    // String client (default value: null)
+    // String client
     test('to test the property `client`', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/model_file_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/model_file_test.dart
index 1a931e285a0..4bf8d1250af 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/model_file_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/model_file_test.dart
@@ -7,7 +7,7 @@ void main() {
 
   group(ModelFile, () {
     // Test capitalization
-    // String sourceURI (default value: null)
+    // String sourceURI
     test('to test the property `sourceURI`', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/model_list_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/model_list_test.dart
index 4d104ab7edc..03cfd40a8f1 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/model_list_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/model_list_test.dart
@@ -6,7 +6,7 @@ void main() {
   final instance = ModelList();
 
   group(ModelList, () {
-    // String n123list (default value: null)
+    // String n123list
     test('to test the property `n123list`', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/model_return_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/model_return_test.dart
index 2fc81f4da6c..ac0e3574eab 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/model_return_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/model_return_test.dart
@@ -6,7 +6,7 @@ void main() {
   final instance = ModelReturn();
 
   group(ModelReturn, () {
-    // int return_ (default value: null)
+    // int return_
     test('to test the property `return_`', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/name_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/name_test.dart
index cbc273245e9..7f3fa21ef78 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/name_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/name_test.dart
@@ -6,22 +6,22 @@ void main() {
   final instance = Name();
 
   group(Name, () {
-    // int name (default value: null)
+    // int name
     test('to test the property `name`', () async {
       // TODO
     });
 
-    // int snakeCase (default value: null)
+    // int snakeCase
     test('to test the property `snakeCase`', () async {
       // TODO
     });
 
-    // String property (default value: null)
+    // String property
     test('to test the property `property`', () async {
       // TODO
     });
 
-    // int n123number (default value: null)
+    // int n123number
     test('to test the property `n123number`', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/nullable_class_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/nullable_class_test.dart
index 8452f6d4be4..0bcae3b4e8b 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/nullable_class_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/nullable_class_test.dart
@@ -6,62 +6,62 @@ void main() {
   final instance = NullableClass();
 
   group(NullableClass, () {
-    // int integerProp (default value: null)
+    // int integerProp
     test('to test the property `integerProp`', () async {
       // TODO
     });
 
-    // num numberProp (default value: null)
+    // num numberProp
     test('to test the property `numberProp`', () async {
       // TODO
     });
 
-    // bool booleanProp (default value: null)
+    // bool booleanProp
     test('to test the property `booleanProp`', () async {
       // TODO
     });
 
-    // String stringProp (default value: null)
+    // String stringProp
     test('to test the property `stringProp`', () async {
       // TODO
     });
 
-    // DateTime dateProp (default value: null)
+    // DateTime dateProp
     test('to test the property `dateProp`', () async {
       // TODO
     });
 
-    // DateTime datetimeProp (default value: null)
+    // DateTime datetimeProp
     test('to test the property `datetimeProp`', () async {
       // TODO
     });
 
-    // BuiltList<JsonObject> arrayNullableProp (default value: const [])
+    // BuiltList<JsonObject> arrayNullableProp
     test('to test the property `arrayNullableProp`', () async {
       // TODO
     });
 
-    // BuiltList<JsonObject> arrayAndItemsNullableProp (default value: const [])
+    // BuiltList<JsonObject> arrayAndItemsNullableProp
     test('to test the property `arrayAndItemsNullableProp`', () async {
       // TODO
     });
 
-    // BuiltList<JsonObject> arrayItemsNullable (default value: const [])
+    // BuiltList<JsonObject> arrayItemsNullable
     test('to test the property `arrayItemsNullable`', () async {
       // TODO
     });
 
-    // BuiltMap<String, JsonObject> objectNullableProp (default value: const {})
+    // BuiltMap<String, JsonObject> objectNullableProp
     test('to test the property `objectNullableProp`', () async {
       // TODO
     });
 
-    // BuiltMap<String, JsonObject> objectAndItemsNullableProp (default value: const {})
+    // BuiltMap<String, JsonObject> objectAndItemsNullableProp
     test('to test the property `objectAndItemsNullableProp`', () async {
       // TODO
     });
 
-    // BuiltMap<String, JsonObject> objectItemsNullable (default value: const {})
+    // BuiltMap<String, JsonObject> objectItemsNullable
     test('to test the property `objectItemsNullable`', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/number_only_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/number_only_test.dart
index 0b905011687..2630062232e 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/number_only_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/number_only_test.dart
@@ -6,7 +6,7 @@ void main() {
   final instance = NumberOnly();
 
   group(NumberOnly, () {
-    // num justNumber (default value: null)
+    // num justNumber
     test('to test the property `justNumber`', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/order_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/order_test.dart
index ea9ac6e14eb..25b2cc396f3 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/order_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/order_test.dart
@@ -6,28 +6,28 @@ void main() {
   final instance = Order();
 
   group(Order, () {
-    // int id (default value: null)
+    // int id
     test('to test the property `id`', () async {
       // TODO
     });
 
-    // int petId (default value: null)
+    // int petId
     test('to test the property `petId`', () async {
       // TODO
     });
 
-    // int quantity (default value: null)
+    // int quantity
     test('to test the property `quantity`', () async {
       // TODO
     });
 
-    // DateTime shipDate (default value: null)
+    // DateTime shipDate
     test('to test the property `shipDate`', () async {
       // TODO
     });
 
     // Order Status
-    // String status (default value: null)
+    // String status
     test('to test the property `status`', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/outer_composite_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/outer_composite_test.dart
index b6231d10498..a48b12809c6 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/outer_composite_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/outer_composite_test.dart
@@ -6,17 +6,17 @@ void main() {
   final instance = OuterComposite();
 
   group(OuterComposite, () {
-    // num myNumber (default value: null)
+    // num myNumber
     test('to test the property `myNumber`', () async {
       // TODO
     });
 
-    // String myString (default value: null)
+    // String myString
     test('to test the property `myString`', () async {
       // TODO
     });
 
-    // bool myBoolean (default value: null)
+    // bool myBoolean
     test('to test the property `myBoolean`', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/pet_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/pet_test.dart
index 63cfc070e93..9d5b6e4dd4a 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/pet_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/pet_test.dart
@@ -6,33 +6,33 @@ void main() {
   final instance = Pet();
 
   group(Pet, () {
-    // int id (default value: null)
+    // int id
     test('to test the property `id`', () async {
       // TODO
     });
 
-    // Category category (default value: null)
+    // Category category
     test('to test the property `category`', () async {
       // TODO
     });
 
-    // String name (default value: null)
+    // String name
     test('to test the property `name`', () async {
       // TODO
     });
 
-    // BuiltList<String> photoUrls (default value: const [])
+    // BuiltList<String> photoUrls
     test('to test the property `photoUrls`', () async {
       // TODO
     });
 
-    // BuiltList<Tag> tags (default value: const [])
+    // BuiltList<Tag> tags
     test('to test the property `tags`', () async {
       // TODO
     });
 
     // pet status in the store
-    // String status (default value: null)
+    // String status
     test('to test the property `status`', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/read_only_first_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/read_only_first_test.dart
index 3c69d593aca..cdb7de301ea 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/read_only_first_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/read_only_first_test.dart
@@ -6,12 +6,12 @@ void main() {
   final instance = ReadOnlyFirst();
 
   group(ReadOnlyFirst, () {
-    // String bar (default value: null)
+    // String bar
     test('to test the property `bar`', () async {
       // TODO
     });
 
-    // String baz (default value: null)
+    // String baz
     test('to test the property `baz`', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/special_model_name_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/special_model_name_test.dart
index f23c11a347b..41d8d80eeb0 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/special_model_name_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/special_model_name_test.dart
@@ -6,7 +6,7 @@ void main() {
   final instance = SpecialModelName();
 
   group(SpecialModelName, () {
-    // int dollarSpecialLeftSquareBracketPropertyPeriodNameRightSquareBracket (default value: null)
+    // int dollarSpecialLeftSquareBracketPropertyPeriodNameRightSquareBracket
     test('to test the property `dollarSpecialLeftSquareBracketPropertyPeriodNameRightSquareBracket`', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/tag_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/tag_test.dart
index c2757a71863..0dbda6e4986 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/tag_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/tag_test.dart
@@ -6,12 +6,12 @@ void main() {
   final instance = Tag();
 
   group(Tag, () {
-    // int id (default value: null)
+    // int id
     test('to test the property `id`', () async {
       // TODO
     });
 
-    // String name (default value: null)
+    // String name
     test('to test the property `name`', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/user_test.dart b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/user_test.dart
index b598e7f7fef..09e720b625c 100644
--- a/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/user_test.dart
+++ b/samples/openapi3/client/petstore/dart-dio/petstore_client_lib_fake/test/user_test.dart
@@ -6,43 +6,43 @@ void main() {
   final instance = User();
 
   group(User, () {
-    // int id (default value: null)
+    // int id
     test('to test the property `id`', () async {
       // TODO
     });
 
-    // String username (default value: null)
+    // String username
     test('to test the property `username`', () async {
       // TODO
     });
 
-    // String firstName (default value: null)
+    // String firstName
     test('to test the property `firstName`', () async {
       // TODO
     });
 
-    // String lastName (default value: null)
+    // String lastName
     test('to test the property `lastName`', () async {
       // TODO
     });
 
-    // String email (default value: null)
+    // String email
     test('to test the property `email`', () async {
       // TODO
     });
 
-    // String password (default value: null)
+    // String password
     test('to test the property `password`', () async {
       // TODO
     });
 
-    // String phone (default value: null)
+    // String phone
     test('to test the property `phone`', () async {
       // TODO
     });
 
     // User Status
-    // int userStatus (default value: null)
+    // int userStatus
     test('to test the property `userStatus`', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib/doc/InlineObject.md b/samples/openapi3/client/petstore/dart2/petstore_client_lib/doc/InlineObject.md
deleted file mode 100644
index 9aa480dee58..00000000000
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib/doc/InlineObject.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# openapi.model.InlineObject
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**name** | **String** | Updated name of the pet | [optional] 
-**status** | **String** | Updated status of the pet | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib/doc/InlineObject1.md b/samples/openapi3/client/petstore/dart2/petstore_client_lib/doc/InlineObject1.md
deleted file mode 100644
index 0a92dbfdb95..00000000000
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib/doc/InlineObject1.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# openapi.model.InlineObject1
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**additionalMetadata** | **String** | Additional data to pass to server | [optional] 
-**file** | [**MultipartFile**](MultipartFile.md) | file to upload | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/model/inline_object.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/model/inline_object.dart
deleted file mode 100644
index d295239554c..00000000000
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/model/inline_object.dart
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-// AUTO-GENERATED FILE, DO NOT MODIFY!
-//
-// @dart=2.0
-
-// ignore_for_file: unused_element, unused_import
-// ignore_for_file: always_put_required_named_parameters_first
-// ignore_for_file: lines_longer_than_80_chars
-
-part of openapi.api;
-
-class InlineObject {
-  /// Returns a new [InlineObject] instance.
-  InlineObject({
-    this.name,
-    this.status,
-  });
-
-  /// Updated name of the pet
-  String name;
-
-  /// Updated status of the pet
-  String status;
-
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is InlineObject &&
-     other.name == name &&
-     other.status == status;
-
-  @override
-  int get hashCode =>
-    (name == null ? 0 : name.hashCode) +
-    (status == null ? 0 : status.hashCode);
-
-  @override
-  String toString() => 'InlineObject[name=$name, status=$status]';
-
-  Map<String, dynamic> toJson() {
-    final json = <String, dynamic>{};
-    if (name != null) {
-      json[r'name'] = name;
-    }
-    if (status != null) {
-      json[r'status'] = status;
-    }
-    return json;
-  }
-
-  /// Returns a new [InlineObject] instance and imports its values from
-  /// [json] if it's non-null, null if [json] is null.
-  static InlineObject fromJson(Map<String, dynamic> json) => json == null
-    ? null
-    : InlineObject(
-        name: json[r'name'],
-        status: json[r'status'],
-    );
-
-  static List<InlineObject> listFromJson(List<dynamic> json, {bool emptyIsNull, bool growable,}) =>
-    json == null || json.isEmpty
-      ? true == emptyIsNull ? null : <InlineObject>[]
-      : json.map((v) => InlineObject.fromJson(v)).toList(growable: true == growable);
-
-  static Map<String, InlineObject> mapFromJson(Map<String, dynamic> json) {
-    final map = <String, InlineObject>{};
-    if (json != null && json.isNotEmpty) {
-      json.forEach((String key, dynamic v) => map[key] = InlineObject.fromJson(v));
-    }
-    return map;
-  }
-
-  // maps a json object with a list of InlineObject-objects as value to a dart map
-  static Map<String, List<InlineObject>> mapListFromJson(Map<String, dynamic> json, {bool emptyIsNull, bool growable,}) {
-    final map = <String, List<InlineObject>>{};
-    if (json != null && json.isNotEmpty) {
-      json.forEach((String key, dynamic v) {
-        map[key] = InlineObject.listFromJson(v, emptyIsNull: emptyIsNull, growable: growable);
-      });
-    }
-    return map;
-  }
-}
-
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/model/inline_object1.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/model/inline_object1.dart
deleted file mode 100644
index 95532d1c47f..00000000000
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/model/inline_object1.dart
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-// AUTO-GENERATED FILE, DO NOT MODIFY!
-//
-// @dart=2.0
-
-// ignore_for_file: unused_element, unused_import
-// ignore_for_file: always_put_required_named_parameters_first
-// ignore_for_file: lines_longer_than_80_chars
-
-part of openapi.api;
-
-class InlineObject1 {
-  /// Returns a new [InlineObject1] instance.
-  InlineObject1({
-    this.additionalMetadata,
-    this.file,
-  });
-
-  /// Additional data to pass to server
-  String additionalMetadata;
-
-  /// file to upload
-  MultipartFile file;
-
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is InlineObject1 &&
-     other.additionalMetadata == additionalMetadata &&
-     other.file == file;
-
-  @override
-  int get hashCode =>
-    (additionalMetadata == null ? 0 : additionalMetadata.hashCode) +
-    (file == null ? 0 : file.hashCode);
-
-  @override
-  String toString() => 'InlineObject1[additionalMetadata=$additionalMetadata, file=$file]';
-
-  Map<String, dynamic> toJson() {
-    final json = <String, dynamic>{};
-    if (additionalMetadata != null) {
-      json[r'additionalMetadata'] = additionalMetadata;
-    }
-    if (file != null) {
-      json[r'file'] = file;
-    }
-    return json;
-  }
-
-  /// Returns a new [InlineObject1] instance and imports its values from
-  /// [json] if it's non-null, null if [json] is null.
-  static InlineObject1 fromJson(Map<String, dynamic> json) => json == null
-    ? null
-    : InlineObject1(
-        additionalMetadata: json[r'additionalMetadata'],
-        file: null, // No support for decoding binary content from JSON
-    );
-
-  static List<InlineObject1> listFromJson(List<dynamic> json, {bool emptyIsNull, bool growable,}) =>
-    json == null || json.isEmpty
-      ? true == emptyIsNull ? null : <InlineObject1>[]
-      : json.map((v) => InlineObject1.fromJson(v)).toList(growable: true == growable);
-
-  static Map<String, InlineObject1> mapFromJson(Map<String, dynamic> json) {
-    final map = <String, InlineObject1>{};
-    if (json != null && json.isNotEmpty) {
-      json.forEach((String key, dynamic v) => map[key] = InlineObject1.fromJson(v));
-    }
-    return map;
-  }
-
-  // maps a json object with a list of InlineObject1-objects as value to a dart map
-  static Map<String, List<InlineObject1>> mapListFromJson(Map<String, dynamic> json, {bool emptyIsNull, bool growable,}) {
-    final map = <String, List<InlineObject1>>{};
-    if (json != null && json.isNotEmpty) {
-      json.forEach((String key, dynamic v) {
-        map[key] = InlineObject1.listFromJson(v, emptyIsNull: emptyIsNull, growable: growable);
-      });
-    }
-    return map;
-  }
-}
-
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/doc/InlineObject.md b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/doc/InlineObject.md
deleted file mode 100644
index 9aa480dee58..00000000000
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/doc/InlineObject.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# openapi.model.InlineObject
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**name** | **String** | Updated name of the pet | [optional] 
-**status** | **String** | Updated status of the pet | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/doc/InlineObject1.md b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/doc/InlineObject1.md
deleted file mode 100644
index 0a92dbfdb95..00000000000
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/doc/InlineObject1.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# openapi.model.InlineObject1
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**additionalMetadata** | **String** | Additional data to pass to server | [optional] 
-**file** | [**MultipartFile**](MultipartFile.md) | file to upload | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/doc/InlineObject2.md b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/doc/InlineObject2.md
deleted file mode 100644
index 64edf2983bc..00000000000
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/doc/InlineObject2.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# openapi.model.InlineObject2
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**enumFormStringArray** | **List<String>** | Form parameter enum test (string array) | [optional] [default to const []]
-**enumFormString** | **String** | Form parameter enum test (string) | [optional] [default to '-efg']
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/doc/InlineObject3.md b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/doc/InlineObject3.md
deleted file mode 100644
index c9a110e7c8c..00000000000
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/doc/InlineObject3.md
+++ /dev/null
@@ -1,28 +0,0 @@
-# openapi.model.InlineObject3
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**integer** | **int** | None | [optional] 
-**int32** | **int** | None | [optional] 
-**int64** | **int** | None | [optional] 
-**number** | **num** | None | 
-**float** | **double** | None | [optional] 
-**double_** | **double** | None | 
-**string** | **String** | None | [optional] 
-**patternWithoutDelimiter** | **String** | None | 
-**byte** | **String** | None | 
-**binary** | [**MultipartFile**](MultipartFile.md) | None | [optional] 
-**date** | [**DateTime**](DateTime.md) | None | [optional] 
-**dateTime** | [**DateTime**](DateTime.md) | None | [optional] 
-**password** | **String** | None | [optional] 
-**callback** | **String** | None | [optional] 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/doc/InlineObject4.md b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/doc/InlineObject4.md
deleted file mode 100644
index 3823ffff979..00000000000
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/doc/InlineObject4.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# openapi.model.InlineObject4
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**param** | **String** | field1 | 
-**param2** | **String** | field2 | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/doc/InlineObject5.md b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/doc/InlineObject5.md
deleted file mode 100644
index 35879f28bd1..00000000000
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/doc/InlineObject5.md
+++ /dev/null
@@ -1,16 +0,0 @@
-# openapi.model.InlineObject5
-
-## Load the model package
-```dart
-import 'package:openapi/api.dart';
-```
-
-## Properties
-Name | Type | Description | Notes
------------- | ------------- | ------------- | -------------
-**additionalMetadata** | **String** | Additional data to pass to server | [optional] 
-**requiredFile** | [**MultipartFile**](MultipartFile.md) | file to upload | 
-
-[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
-
-
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/model/inline_object.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/model/inline_object.dart
deleted file mode 100644
index d295239554c..00000000000
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/model/inline_object.dart
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-// AUTO-GENERATED FILE, DO NOT MODIFY!
-//
-// @dart=2.0
-
-// ignore_for_file: unused_element, unused_import
-// ignore_for_file: always_put_required_named_parameters_first
-// ignore_for_file: lines_longer_than_80_chars
-
-part of openapi.api;
-
-class InlineObject {
-  /// Returns a new [InlineObject] instance.
-  InlineObject({
-    this.name,
-    this.status,
-  });
-
-  /// Updated name of the pet
-  String name;
-
-  /// Updated status of the pet
-  String status;
-
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is InlineObject &&
-     other.name == name &&
-     other.status == status;
-
-  @override
-  int get hashCode =>
-    (name == null ? 0 : name.hashCode) +
-    (status == null ? 0 : status.hashCode);
-
-  @override
-  String toString() => 'InlineObject[name=$name, status=$status]';
-
-  Map<String, dynamic> toJson() {
-    final json = <String, dynamic>{};
-    if (name != null) {
-      json[r'name'] = name;
-    }
-    if (status != null) {
-      json[r'status'] = status;
-    }
-    return json;
-  }
-
-  /// Returns a new [InlineObject] instance and imports its values from
-  /// [json] if it's non-null, null if [json] is null.
-  static InlineObject fromJson(Map<String, dynamic> json) => json == null
-    ? null
-    : InlineObject(
-        name: json[r'name'],
-        status: json[r'status'],
-    );
-
-  static List<InlineObject> listFromJson(List<dynamic> json, {bool emptyIsNull, bool growable,}) =>
-    json == null || json.isEmpty
-      ? true == emptyIsNull ? null : <InlineObject>[]
-      : json.map((v) => InlineObject.fromJson(v)).toList(growable: true == growable);
-
-  static Map<String, InlineObject> mapFromJson(Map<String, dynamic> json) {
-    final map = <String, InlineObject>{};
-    if (json != null && json.isNotEmpty) {
-      json.forEach((String key, dynamic v) => map[key] = InlineObject.fromJson(v));
-    }
-    return map;
-  }
-
-  // maps a json object with a list of InlineObject-objects as value to a dart map
-  static Map<String, List<InlineObject>> mapListFromJson(Map<String, dynamic> json, {bool emptyIsNull, bool growable,}) {
-    final map = <String, List<InlineObject>>{};
-    if (json != null && json.isNotEmpty) {
-      json.forEach((String key, dynamic v) {
-        map[key] = InlineObject.listFromJson(v, emptyIsNull: emptyIsNull, growable: growable);
-      });
-    }
-    return map;
-  }
-}
-
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/model/inline_object1.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/model/inline_object1.dart
deleted file mode 100644
index 95532d1c47f..00000000000
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/model/inline_object1.dart
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-// AUTO-GENERATED FILE, DO NOT MODIFY!
-//
-// @dart=2.0
-
-// ignore_for_file: unused_element, unused_import
-// ignore_for_file: always_put_required_named_parameters_first
-// ignore_for_file: lines_longer_than_80_chars
-
-part of openapi.api;
-
-class InlineObject1 {
-  /// Returns a new [InlineObject1] instance.
-  InlineObject1({
-    this.additionalMetadata,
-    this.file,
-  });
-
-  /// Additional data to pass to server
-  String additionalMetadata;
-
-  /// file to upload
-  MultipartFile file;
-
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is InlineObject1 &&
-     other.additionalMetadata == additionalMetadata &&
-     other.file == file;
-
-  @override
-  int get hashCode =>
-    (additionalMetadata == null ? 0 : additionalMetadata.hashCode) +
-    (file == null ? 0 : file.hashCode);
-
-  @override
-  String toString() => 'InlineObject1[additionalMetadata=$additionalMetadata, file=$file]';
-
-  Map<String, dynamic> toJson() {
-    final json = <String, dynamic>{};
-    if (additionalMetadata != null) {
-      json[r'additionalMetadata'] = additionalMetadata;
-    }
-    if (file != null) {
-      json[r'file'] = file;
-    }
-    return json;
-  }
-
-  /// Returns a new [InlineObject1] instance and imports its values from
-  /// [json] if it's non-null, null if [json] is null.
-  static InlineObject1 fromJson(Map<String, dynamic> json) => json == null
-    ? null
-    : InlineObject1(
-        additionalMetadata: json[r'additionalMetadata'],
-        file: null, // No support for decoding binary content from JSON
-    );
-
-  static List<InlineObject1> listFromJson(List<dynamic> json, {bool emptyIsNull, bool growable,}) =>
-    json == null || json.isEmpty
-      ? true == emptyIsNull ? null : <InlineObject1>[]
-      : json.map((v) => InlineObject1.fromJson(v)).toList(growable: true == growable);
-
-  static Map<String, InlineObject1> mapFromJson(Map<String, dynamic> json) {
-    final map = <String, InlineObject1>{};
-    if (json != null && json.isNotEmpty) {
-      json.forEach((String key, dynamic v) => map[key] = InlineObject1.fromJson(v));
-    }
-    return map;
-  }
-
-  // maps a json object with a list of InlineObject1-objects as value to a dart map
-  static Map<String, List<InlineObject1>> mapListFromJson(Map<String, dynamic> json, {bool emptyIsNull, bool growable,}) {
-    final map = <String, List<InlineObject1>>{};
-    if (json != null && json.isNotEmpty) {
-      json.forEach((String key, dynamic v) {
-        map[key] = InlineObject1.listFromJson(v, emptyIsNull: emptyIsNull, growable: growable);
-      });
-    }
-    return map;
-  }
-}
-
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/model/inline_object2.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/model/inline_object2.dart
deleted file mode 100644
index 9cb02c86eaa..00000000000
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/model/inline_object2.dart
+++ /dev/null
@@ -1,231 +0,0 @@
-//
-// AUTO-GENERATED FILE, DO NOT MODIFY!
-//
-// @dart=2.0
-
-// ignore_for_file: unused_element, unused_import
-// ignore_for_file: always_put_required_named_parameters_first
-// ignore_for_file: lines_longer_than_80_chars
-
-part of openapi.api;
-
-class InlineObject2 {
-  /// Returns a new [InlineObject2] instance.
-  InlineObject2({
-    this.enumFormStringArray = const [],
-    this.enumFormString = const InlineObject2EnumFormStringEnum._('-efg'),
-  });
-
-  /// Form parameter enum test (string array)
-  List<InlineObject2EnumFormStringArrayEnum> enumFormStringArray;
-
-  /// Form parameter enum test (string)
-  InlineObject2EnumFormStringEnum enumFormString;
-
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is InlineObject2 &&
-     other.enumFormStringArray == enumFormStringArray &&
-     other.enumFormString == enumFormString;
-
-  @override
-  int get hashCode =>
-    (enumFormStringArray == null ? 0 : enumFormStringArray.hashCode) +
-    (enumFormString == null ? 0 : enumFormString.hashCode);
-
-  @override
-  String toString() => 'InlineObject2[enumFormStringArray=$enumFormStringArray, enumFormString=$enumFormString]';
-
-  Map<String, dynamic> toJson() {
-    final json = <String, dynamic>{};
-    if (enumFormStringArray != null) {
-      json[r'enum_form_string_array'] = enumFormStringArray;
-    }
-    if (enumFormString != null) {
-      json[r'enum_form_string'] = enumFormString;
-    }
-    return json;
-  }
-
-  /// Returns a new [InlineObject2] instance and imports its values from
-  /// [json] if it's non-null, null if [json] is null.
-  static InlineObject2 fromJson(Map<String, dynamic> json) => json == null
-    ? null
-    : InlineObject2(
-        enumFormStringArray: InlineObject2EnumFormStringArrayEnum.listFromJson(json[r'enum_form_string_array']),
-        enumFormString: InlineObject2EnumFormStringEnum.fromJson(json[r'enum_form_string']),
-    );
-
-  static List<InlineObject2> listFromJson(List<dynamic> json, {bool emptyIsNull, bool growable,}) =>
-    json == null || json.isEmpty
-      ? true == emptyIsNull ? null : <InlineObject2>[]
-      : json.map((v) => InlineObject2.fromJson(v)).toList(growable: true == growable);
-
-  static Map<String, InlineObject2> mapFromJson(Map<String, dynamic> json) {
-    final map = <String, InlineObject2>{};
-    if (json != null && json.isNotEmpty) {
-      json.forEach((String key, dynamic v) => map[key] = InlineObject2.fromJson(v));
-    }
-    return map;
-  }
-
-  // maps a json object with a list of InlineObject2-objects as value to a dart map
-  static Map<String, List<InlineObject2>> mapListFromJson(Map<String, dynamic> json, {bool emptyIsNull, bool growable,}) {
-    final map = <String, List<InlineObject2>>{};
-    if (json != null && json.isNotEmpty) {
-      json.forEach((String key, dynamic v) {
-        map[key] = InlineObject2.listFromJson(v, emptyIsNull: emptyIsNull, growable: growable);
-      });
-    }
-    return map;
-  }
-}
-
-
-class InlineObject2EnumFormStringArrayEnum {
-  /// Instantiate a new enum with the provided [value].
-  const InlineObject2EnumFormStringArrayEnum._(this.value);
-
-  /// The underlying value of this enum member.
-  final String value;
-
-  @override
-  bool operator ==(Object other) => identical(this, other) ||
-      other is InlineObject2EnumFormStringArrayEnum && other.value == value;
-
-  @override
-  int get hashCode => toString().hashCode;
-
-  @override
-  String toString() => value;
-
-  String toJson() => value;
-
-  static const greaterThan = InlineObject2EnumFormStringArrayEnum._(r'>');
-  static const dollar = InlineObject2EnumFormStringArrayEnum._(r'$');
-
-  /// List of all possible values in this [enum][InlineObject2EnumFormStringArrayEnum].
-  static const values = <InlineObject2EnumFormStringArrayEnum>[
-    greaterThan,
-    dollar,
-  ];
-
-  static InlineObject2EnumFormStringArrayEnum fromJson(dynamic value) =>
-    InlineObject2EnumFormStringArrayEnumTypeTransformer().decode(value);
-
-  static List<InlineObject2EnumFormStringArrayEnum> listFromJson(List<dynamic> json, {bool emptyIsNull, bool growable,}) =>
-    json == null || json.isEmpty
-      ? true == emptyIsNull ? null : <InlineObject2EnumFormStringArrayEnum>[]
-      : json
-          .map((value) => InlineObject2EnumFormStringArrayEnum.fromJson(value))
-          .toList(growable: true == growable);
-}
-
-/// Transformation class that can [encode] an instance of [InlineObject2EnumFormStringArrayEnum] to String,
-/// and [decode] dynamic data back to [InlineObject2EnumFormStringArrayEnum].
-class InlineObject2EnumFormStringArrayEnumTypeTransformer {
-  const InlineObject2EnumFormStringArrayEnumTypeTransformer._();
-
-  factory InlineObject2EnumFormStringArrayEnumTypeTransformer() => _instance ??= InlineObject2EnumFormStringArrayEnumTypeTransformer._();
-
-  String encode(InlineObject2EnumFormStringArrayEnum data) => data.value;
-
-  /// Decodes a [dynamic value][data] to a InlineObject2EnumFormStringArrayEnum.
-  ///
-  /// If [allowNull] is true and the [dynamic value][data] cannot be decoded successfully,
-  /// then null is returned. However, if [allowNull] is false and the [dynamic value][data]
-  /// cannot be decoded successfully, then an [UnimplementedError] is thrown.
-  ///
-  /// The [allowNull] is very handy when an API changes and a new enum value is added or removed,
-  /// and users are still using an old app with the old code.
-  InlineObject2EnumFormStringArrayEnum decode(dynamic data, {bool allowNull}) {
-    switch (data) {
-      case r'>': return InlineObject2EnumFormStringArrayEnum.greaterThan;
-      case r'$': return InlineObject2EnumFormStringArrayEnum.dollar;
-      default:
-        if (allowNull == false) {
-          throw ArgumentError('Unknown enum value to decode: $data');
-        }
-    }
-    return null;
-  }
-
-  /// Singleton [InlineObject2EnumFormStringArrayEnumTypeTransformer] instance.
-  static InlineObject2EnumFormStringArrayEnumTypeTransformer _instance;
-}
-
-/// Form parameter enum test (string)
-class InlineObject2EnumFormStringEnum {
-  /// Instantiate a new enum with the provided [value].
-  const InlineObject2EnumFormStringEnum._(this.value);
-
-  /// The underlying value of this enum member.
-  final String value;
-
-  @override
-  bool operator ==(Object other) => identical(this, other) ||
-      other is InlineObject2EnumFormStringEnum && other.value == value;
-
-  @override
-  int get hashCode => toString().hashCode;
-
-  @override
-  String toString() => value;
-
-  String toJson() => value;
-
-  static const abc = InlineObject2EnumFormStringEnum._(r'_abc');
-  static const efg = InlineObject2EnumFormStringEnum._(r'-efg');
-  static const leftParenthesisXyzRightParenthesis = InlineObject2EnumFormStringEnum._(r'(xyz)');
-
-  /// List of all possible values in this [enum][InlineObject2EnumFormStringEnum].
-  static const values = <InlineObject2EnumFormStringEnum>[
-    abc,
-    efg,
-    leftParenthesisXyzRightParenthesis,
-  ];
-
-  static InlineObject2EnumFormStringEnum fromJson(dynamic value) =>
-    InlineObject2EnumFormStringEnumTypeTransformer().decode(value);
-
-  static List<InlineObject2EnumFormStringEnum> listFromJson(List<dynamic> json, {bool emptyIsNull, bool growable,}) =>
-    json == null || json.isEmpty
-      ? true == emptyIsNull ? null : <InlineObject2EnumFormStringEnum>[]
-      : json
-          .map((value) => InlineObject2EnumFormStringEnum.fromJson(value))
-          .toList(growable: true == growable);
-}
-
-/// Transformation class that can [encode] an instance of [InlineObject2EnumFormStringEnum] to String,
-/// and [decode] dynamic data back to [InlineObject2EnumFormStringEnum].
-class InlineObject2EnumFormStringEnumTypeTransformer {
-  const InlineObject2EnumFormStringEnumTypeTransformer._();
-
-  factory InlineObject2EnumFormStringEnumTypeTransformer() => _instance ??= InlineObject2EnumFormStringEnumTypeTransformer._();
-
-  String encode(InlineObject2EnumFormStringEnum data) => data.value;
-
-  /// Decodes a [dynamic value][data] to a InlineObject2EnumFormStringEnum.
-  ///
-  /// If [allowNull] is true and the [dynamic value][data] cannot be decoded successfully,
-  /// then null is returned. However, if [allowNull] is false and the [dynamic value][data]
-  /// cannot be decoded successfully, then an [UnimplementedError] is thrown.
-  ///
-  /// The [allowNull] is very handy when an API changes and a new enum value is added or removed,
-  /// and users are still using an old app with the old code.
-  InlineObject2EnumFormStringEnum decode(dynamic data, {bool allowNull}) {
-    switch (data) {
-      case r'_abc': return InlineObject2EnumFormStringEnum.abc;
-      case r'-efg': return InlineObject2EnumFormStringEnum.efg;
-      case r'(xyz)': return InlineObject2EnumFormStringEnum.leftParenthesisXyzRightParenthesis;
-      default:
-        if (allowNull == false) {
-          throw ArgumentError('Unknown enum value to decode: $data');
-        }
-    }
-    return null;
-  }
-
-  /// Singleton [InlineObject2EnumFormStringEnumTypeTransformer] instance.
-  static InlineObject2EnumFormStringEnumTypeTransformer _instance;
-}
-
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/model/inline_object3.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/model/inline_object3.dart
deleted file mode 100644
index c74b8b92529..00000000000
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/model/inline_object3.dart
+++ /dev/null
@@ -1,217 +0,0 @@
-//
-// AUTO-GENERATED FILE, DO NOT MODIFY!
-//
-// @dart=2.0
-
-// ignore_for_file: unused_element, unused_import
-// ignore_for_file: always_put_required_named_parameters_first
-// ignore_for_file: lines_longer_than_80_chars
-
-part of openapi.api;
-
-class InlineObject3 {
-  /// Returns a new [InlineObject3] instance.
-  InlineObject3({
-    this.integer,
-    this.int32,
-    this.int64,
-    @required this.number,
-    this.float,
-    @required this.double_,
-    this.string,
-    @required this.patternWithoutDelimiter,
-    @required this.byte,
-    this.binary,
-    this.date,
-    this.dateTime,
-    this.password,
-    this.callback,
-  });
-
-  /// None
-  // minimum: 10
-  // maximum: 100
-  int integer;
-
-  /// None
-  // minimum: 20
-  // maximum: 200
-  int int32;
-
-  /// None
-  int int64;
-
-  /// None
-  // minimum: 32.1
-  // maximum: 543.2
-  num number;
-
-  /// None
-  // maximum: 987.6
-  double float;
-
-  /// None
-  // minimum: 67.8
-  // maximum: 123.4
-  double double_;
-
-  /// None
-  String string;
-
-  /// None
-  String patternWithoutDelimiter;
-
-  /// None
-  String byte;
-
-  /// None
-  MultipartFile binary;
-
-  /// None
-  DateTime date;
-
-  /// None
-  DateTime dateTime;
-
-  /// None
-  String password;
-
-  /// None
-  String callback;
-
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is InlineObject3 &&
-     other.integer == integer &&
-     other.int32 == int32 &&
-     other.int64 == int64 &&
-     other.number == number &&
-     other.float == float &&
-     other.double_ == double_ &&
-     other.string == string &&
-     other.patternWithoutDelimiter == patternWithoutDelimiter &&
-     other.byte == byte &&
-     other.binary == binary &&
-     other.date == date &&
-     other.dateTime == dateTime &&
-     other.password == password &&
-     other.callback == callback;
-
-  @override
-  int get hashCode =>
-    (integer == null ? 0 : integer.hashCode) +
-    (int32 == null ? 0 : int32.hashCode) +
-    (int64 == null ? 0 : int64.hashCode) +
-    (number == null ? 0 : number.hashCode) +
-    (float == null ? 0 : float.hashCode) +
-    (double_ == null ? 0 : double_.hashCode) +
-    (string == null ? 0 : string.hashCode) +
-    (patternWithoutDelimiter == null ? 0 : patternWithoutDelimiter.hashCode) +
-    (byte == null ? 0 : byte.hashCode) +
-    (binary == null ? 0 : binary.hashCode) +
-    (date == null ? 0 : date.hashCode) +
-    (dateTime == null ? 0 : dateTime.hashCode) +
-    (password == null ? 0 : password.hashCode) +
-    (callback == null ? 0 : callback.hashCode);
-
-  @override
-  String toString() => 'InlineObject3[integer=$integer, int32=$int32, int64=$int64, number=$number, float=$float, double_=$double_, string=$string, patternWithoutDelimiter=$patternWithoutDelimiter, byte=$byte, binary=$binary, date=$date, dateTime=$dateTime, password=$password, callback=$callback]';
-
-  Map<String, dynamic> toJson() {
-    final json = <String, dynamic>{};
-    if (integer != null) {
-      json[r'integer'] = integer;
-    }
-    if (int32 != null) {
-      json[r'int32'] = int32;
-    }
-    if (int64 != null) {
-      json[r'int64'] = int64;
-    }
-    if (number != null) {
-      json[r'number'] = number;
-    }
-    if (float != null) {
-      json[r'float'] = float;
-    }
-    if (double_ != null) {
-      json[r'double'] = double_;
-    }
-    if (string != null) {
-      json[r'string'] = string;
-    }
-    if (patternWithoutDelimiter != null) {
-      json[r'pattern_without_delimiter'] = patternWithoutDelimiter;
-    }
-    if (byte != null) {
-      json[r'byte'] = byte;
-    }
-    if (binary != null) {
-      json[r'binary'] = binary;
-    }
-    if (date != null) {
-      json[r'date'] = _dateFormatter.format(date.toUtc());
-    }
-    if (dateTime != null) {
-      json[r'dateTime'] = dateTime.toUtc().toIso8601String();
-    }
-    if (password != null) {
-      json[r'password'] = password;
-    }
-    if (callback != null) {
-      json[r'callback'] = callback;
-    }
-    return json;
-  }
-
-  /// Returns a new [InlineObject3] instance and imports its values from
-  /// [json] if it's non-null, null if [json] is null.
-  static InlineObject3 fromJson(Map<String, dynamic> json) => json == null
-    ? null
-    : InlineObject3(
-        integer: json[r'integer'],
-        int32: json[r'int32'],
-        int64: json[r'int64'],
-        number: json[r'number'] == null ?
-          null :
-          json[r'number'].toDouble(),
-        float: json[r'float'],
-        double_: json[r'double'],
-        string: json[r'string'],
-        patternWithoutDelimiter: json[r'pattern_without_delimiter'],
-        byte: json[r'byte'],
-        binary: null, // No support for decoding binary content from JSON
-        date: json[r'date'] == null
-          ? null
-          : DateTime.parse(json[r'date']),
-        dateTime: json[r'dateTime'] == null
-          ? null
-          : DateTime.parse(json[r'dateTime']),
-        password: json[r'password'],
-        callback: json[r'callback'],
-    );
-
-  static List<InlineObject3> listFromJson(List<dynamic> json, {bool emptyIsNull, bool growable,}) =>
-    json == null || json.isEmpty
-      ? true == emptyIsNull ? null : <InlineObject3>[]
-      : json.map((v) => InlineObject3.fromJson(v)).toList(growable: true == growable);
-
-  static Map<String, InlineObject3> mapFromJson(Map<String, dynamic> json) {
-    final map = <String, InlineObject3>{};
-    if (json != null && json.isNotEmpty) {
-      json.forEach((String key, dynamic v) => map[key] = InlineObject3.fromJson(v));
-    }
-    return map;
-  }
-
-  // maps a json object with a list of InlineObject3-objects as value to a dart map
-  static Map<String, List<InlineObject3>> mapListFromJson(Map<String, dynamic> json, {bool emptyIsNull, bool growable,}) {
-    final map = <String, List<InlineObject3>>{};
-    if (json != null && json.isNotEmpty) {
-      json.forEach((String key, dynamic v) {
-        map[key] = InlineObject3.listFromJson(v, emptyIsNull: emptyIsNull, growable: growable);
-      });
-    }
-    return map;
-  }
-}
-
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/model/inline_object4.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/model/inline_object4.dart
deleted file mode 100644
index 27ac3c05772..00000000000
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/model/inline_object4.dart
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-// AUTO-GENERATED FILE, DO NOT MODIFY!
-//
-// @dart=2.0
-
-// ignore_for_file: unused_element, unused_import
-// ignore_for_file: always_put_required_named_parameters_first
-// ignore_for_file: lines_longer_than_80_chars
-
-part of openapi.api;
-
-class InlineObject4 {
-  /// Returns a new [InlineObject4] instance.
-  InlineObject4({
-    @required this.param,
-    @required this.param2,
-  });
-
-  /// field1
-  String param;
-
-  /// field2
-  String param2;
-
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is InlineObject4 &&
-     other.param == param &&
-     other.param2 == param2;
-
-  @override
-  int get hashCode =>
-    (param == null ? 0 : param.hashCode) +
-    (param2 == null ? 0 : param2.hashCode);
-
-  @override
-  String toString() => 'InlineObject4[param=$param, param2=$param2]';
-
-  Map<String, dynamic> toJson() {
-    final json = <String, dynamic>{};
-    if (param != null) {
-      json[r'param'] = param;
-    }
-    if (param2 != null) {
-      json[r'param2'] = param2;
-    }
-    return json;
-  }
-
-  /// Returns a new [InlineObject4] instance and imports its values from
-  /// [json] if it's non-null, null if [json] is null.
-  static InlineObject4 fromJson(Map<String, dynamic> json) => json == null
-    ? null
-    : InlineObject4(
-        param: json[r'param'],
-        param2: json[r'param2'],
-    );
-
-  static List<InlineObject4> listFromJson(List<dynamic> json, {bool emptyIsNull, bool growable,}) =>
-    json == null || json.isEmpty
-      ? true == emptyIsNull ? null : <InlineObject4>[]
-      : json.map((v) => InlineObject4.fromJson(v)).toList(growable: true == growable);
-
-  static Map<String, InlineObject4> mapFromJson(Map<String, dynamic> json) {
-    final map = <String, InlineObject4>{};
-    if (json != null && json.isNotEmpty) {
-      json.forEach((String key, dynamic v) => map[key] = InlineObject4.fromJson(v));
-    }
-    return map;
-  }
-
-  // maps a json object with a list of InlineObject4-objects as value to a dart map
-  static Map<String, List<InlineObject4>> mapListFromJson(Map<String, dynamic> json, {bool emptyIsNull, bool growable,}) {
-    final map = <String, List<InlineObject4>>{};
-    if (json != null && json.isNotEmpty) {
-      json.forEach((String key, dynamic v) {
-        map[key] = InlineObject4.listFromJson(v, emptyIsNull: emptyIsNull, growable: growable);
-      });
-    }
-    return map;
-  }
-}
-
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/model/inline_object5.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/model/inline_object5.dart
deleted file mode 100644
index 472b4be5413..00000000000
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/model/inline_object5.dart
+++ /dev/null
@@ -1,82 +0,0 @@
-//
-// AUTO-GENERATED FILE, DO NOT MODIFY!
-//
-// @dart=2.0
-
-// ignore_for_file: unused_element, unused_import
-// ignore_for_file: always_put_required_named_parameters_first
-// ignore_for_file: lines_longer_than_80_chars
-
-part of openapi.api;
-
-class InlineObject5 {
-  /// Returns a new [InlineObject5] instance.
-  InlineObject5({
-    this.additionalMetadata,
-    @required this.requiredFile,
-  });
-
-  /// Additional data to pass to server
-  String additionalMetadata;
-
-  /// file to upload
-  MultipartFile requiredFile;
-
-  @override
-  bool operator ==(Object other) => identical(this, other) || other is InlineObject5 &&
-     other.additionalMetadata == additionalMetadata &&
-     other.requiredFile == requiredFile;
-
-  @override
-  int get hashCode =>
-    (additionalMetadata == null ? 0 : additionalMetadata.hashCode) +
-    (requiredFile == null ? 0 : requiredFile.hashCode);
-
-  @override
-  String toString() => 'InlineObject5[additionalMetadata=$additionalMetadata, requiredFile=$requiredFile]';
-
-  Map<String, dynamic> toJson() {
-    final json = <String, dynamic>{};
-    if (additionalMetadata != null) {
-      json[r'additionalMetadata'] = additionalMetadata;
-    }
-    if (requiredFile != null) {
-      json[r'requiredFile'] = requiredFile;
-    }
-    return json;
-  }
-
-  /// Returns a new [InlineObject5] instance and imports its values from
-  /// [json] if it's non-null, null if [json] is null.
-  static InlineObject5 fromJson(Map<String, dynamic> json) => json == null
-    ? null
-    : InlineObject5(
-        additionalMetadata: json[r'additionalMetadata'],
-        requiredFile: null, // No support for decoding binary content from JSON
-    );
-
-  static List<InlineObject5> listFromJson(List<dynamic> json, {bool emptyIsNull, bool growable,}) =>
-    json == null || json.isEmpty
-      ? true == emptyIsNull ? null : <InlineObject5>[]
-      : json.map((v) => InlineObject5.fromJson(v)).toList(growable: true == growable);
-
-  static Map<String, InlineObject5> mapFromJson(Map<String, dynamic> json) {
-    final map = <String, InlineObject5>{};
-    if (json != null && json.isNotEmpty) {
-      json.forEach((String key, dynamic v) => map[key] = InlineObject5.fromJson(v));
-    }
-    return map;
-  }
-
-  // maps a json object with a list of InlineObject5-objects as value to a dart map
-  static Map<String, List<InlineObject5>> mapListFromJson(Map<String, dynamic> json, {bool emptyIsNull, bool growable,}) {
-    final map = <String, List<InlineObject5>>{};
-    if (json != null && json.isNotEmpty) {
-      json.forEach((String key, dynamic v) {
-        map[key] = InlineObject5.listFromJson(v, emptyIsNull: emptyIsNull, growable: growable);
-      });
-    }
-    return map;
-  }
-}
-
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/test/another_fake_api_test.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/test/another_fake_api_test.dart
index 790140d45a7..355b4140bdd 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/test/another_fake_api_test.dart
+++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/test/another_fake_api_test.dart
@@ -20,7 +20,7 @@ void main() {
     //
     // To test special tags and operation ID starting with number
     //
-    //Future<Client> call123testSpecialTags(Client client) async
+    //Future<ModelClient> call123testSpecialTags(ModelClient modelClient) async
     test('test call123testSpecialTags', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/test/fake_api_test.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/test/fake_api_test.dart
index 004677ba786..f4e1969481c 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/test/fake_api_test.dart
+++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/test/fake_api_test.dart
@@ -74,7 +74,7 @@ void main() {
     //
     // To test \"client\" model
     //
-    //Future<Client> testClientModel(Client client) async
+    //Future<ModelClient> testClientModel(ModelClient modelClient) async
     test('test testClientModel', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/test/fake_classname_tags123_api_test.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/test/fake_classname_tags123_api_test.dart
index 1cdf662877b..1a0f9658947 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/test/fake_classname_tags123_api_test.dart
+++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/test/fake_classname_tags123_api_test.dart
@@ -20,7 +20,7 @@ void main() {
     //
     // To test class name in snake case
     //
-    //Future<Client> testClassname(Client client) async
+    //Future<ModelClient> testClassname(ModelClient modelClient) async
     test('test testClassname', () async {
       // TODO
     });
diff --git a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/test/file_schema_test_class_test.dart b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/test/file_schema_test_class_test.dart
index d9749c91d24..7743739489a 100644
--- a/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/test/file_schema_test_class_test.dart
+++ b/samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/test/file_schema_test_class_test.dart
@@ -6,12 +6,12 @@ void main() {
   final instance = FileSchemaTestClass();
 
   group('test FileSchemaTestClass', () {
-    // MultipartFile file
+    // ModelFile file
     test('to test the property `file`', () async {
       // TODO
     });
 
-    // List<MultipartFile> files (default value: const [])
+    // List<ModelFile> files (default value: const [])
     test('to test the property `files`', () async {
       // TODO
     });