[dart][dart-dio] Remove sample formatting from dart-dio-next (#9121)

CI/circle_parallel.sh

@@ -23,7 +23,6 @@ function installDart {
   sudo apt-get update
   sudo apt-get install dart
   export PATH="$PATH:/usr/lib/dart/bin"
-  export DART_POST_PROCESS="dart format"
 }
 
 if [ "$NODE_INDEX" = "1" ]; then

bin/configs/dart-dio-next-petstore-client-lib-fake.yaml

@@ -2,6 +2,5 @@ generatorName: dart-dio-next
 outputDir: samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake
 inputSpec: modules/openapi-generator/src/test/resources/3_0/petstore-with-fake-endpoints-models-for-testing.yaml
 templateDir: modules/openapi-generator/src/main/resources/dart/libraries/dio
-enablePostProcessFile: "true"
 additionalProperties:
   hideGenerationTimestamp: "true"

docs/file-post-processing.md

@@ -22,7 +22,6 @@ The following environment variables are supported by their respective generators
 * `CPP_POST_PROCESS_FILE`
 * `CSHARP_POST_PROCESS_FILE`
 * `C_POST_PROCESS_FILE`
-* `DART_POST_PROCESS`
 * `DART_POST_PROCESS_FILE`
 * `FSHARP_POST_PROCESS_FILE`
 * `GO_POST_PROCESS_FILE`

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

@@ -692,33 +692,4 @@ public abstract class AbstractDartCodegen extends DefaultCodegen {
             }
         }
     }
-
-    @Override
-    public void postProcess() {
-        if (isEnablePostProcessFile()) {
-            // Using the condition here to have way to still disable this
-            // for older Dart generators in CI by default.
-
-            // Post processing the whole dart output is much faster then individual files.
-            // Setting this variable to "dart format" is the suggested way of doing this.
-            final String dartPostProcess = System.getenv("DART_POST_PROCESS");
-            if (!StringUtils.isEmpty(dartPostProcess)) {
-                final String command = dartPostProcess + " " + getOutputDir();
-                try {
-                    Process p = Runtime.getRuntime().exec(command);
-                    int exitValue = p.waitFor();
-                    if (exitValue != 0) {
-                        LOGGER.error("Error running the command ({}). Exit code: {}", command, exitValue);
-                    } else {
-                        LOGGER.info("Successfully executed: {}", command);
-                    }
-                } catch (InterruptedException | IOException e) {
-                    LOGGER.error("Error running the command ({}). Exception: {}", command, e.getMessage());
-                    // Restore interrupted state
-                    Thread.currentThread().interrupt();
-                }
-            }
-        }
-        super.postProcess();
-    }
 }

samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/api.dart

@@ -47,28 +47,19 @@ class Openapi {
 
   void setOAuthToken(String name, String token) {
     if (this.dio.interceptors.any((i) => i is OAuthInterceptor)) {
-      (this.dio.interceptors.firstWhere((i) => i is OAuthInterceptor)
+      (this.dio.interceptors.firstWhere((i) => i is OAuthInterceptor) as OAuthInterceptor).tokens[name] = token;
-              as OAuthInterceptor)
-          .tokens[name] = token;
     }
   }
 
   void setBasicAuth(String name, String username, String password) {
     if (this.dio.interceptors.any((i) => i is BasicAuthInterceptor)) {
-      (this.dio.interceptors.firstWhere((i) => i is BasicAuthInterceptor)
+      (this.dio.interceptors.firstWhere((i) => i is BasicAuthInterceptor) as BasicAuthInterceptor).authInfo[name] = BasicAuthInfo(username, password);
-              as BasicAuthInterceptor)
-          .authInfo[name] = BasicAuthInfo(username, password);
     }
   }
 
   void setApiKey(String name, String apiKey) {
     if (this.dio.interceptors.any((i) => i is ApiKeyAuthInterceptor)) {
-      (this
+      (this.dio.interceptors.firstWhere((element) => element is ApiKeyAuthInterceptor) as ApiKeyAuthInterceptor).apiKeys[name] = apiKey;
-                  .dio
-                  .interceptors
-                  .firstWhere((element) => element is ApiKeyAuthInterceptor)
-              as ApiKeyAuthInterceptor)
-          .apiKeys[name] = apiKey;
     }
   }
 

samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/api/another_fake_api.dart

@@ -10,6 +10,7 @@ import 'package:dio/dio.dart';
 import 'package:openapi/src/model/model_client.dart';
 
 class AnotherFakeApi {
+
   final Dio _dio;
 
   final Serializers _serializers;
@@ -44,13 +45,15 @@ class AnotherFakeApi {
       validateStatus: validateStatus,
     );
 
-    final _queryParameters = <String, dynamic>{};
+    final _queryParameters = <String, dynamic>{
+    };
 
     dynamic _bodyData;
 
     try {
       const _type = FullType(ModelClient);
       _bodyData = _serializers.serialize(modelClient, specifiedType: _type);
+
     } catch(error) {
       throw DioError(
          requestOptions: _options.compose(
@@ -81,6 +84,7 @@ class AnotherFakeApi {
         _response.data!,
         specifiedType: _responseType,
       ) as ModelClient;
+
     } catch (error) {
       throw DioError(
         requestOptions: _response.requestOptions,
@@ -101,4 +105,5 @@ class AnotherFakeApi {
       extra: _response.extra,
     );
   }
+
 }

samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/api/default_api.dart

@@ -10,6 +10,7 @@ import 'package:dio/dio.dart';
 import 'package:openapi/src/model/inline_response_default.dart';
 
 class DefaultApi {
+
   final Dio _dio;
 
   final Serializers _serializers;
@@ -43,7 +44,8 @@ class DefaultApi {
       validateStatus: validateStatus,
     );
 
-    final _queryParameters = <String, dynamic>{};
+    final _queryParameters = <String, dynamic>{
+    };
 
     final _response = await _dio.request<Object>(
       _path,
@@ -62,6 +64,7 @@ class DefaultApi {
         _response.data!,
         specifiedType: _responseType,
       ) as InlineResponseDefault;
+
     } catch (error) {
       throw DioError(
         requestOptions: _response.requestOptions,
@@ -82,4 +85,5 @@ class DefaultApi {
       extra: _response.extra,
     );
   }
+
 }

samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/api/fake_api.dart

@@ -19,6 +19,7 @@ import 'dart:typed_data';
 import 'package:built_collection/built_collection.dart';
 
 class FakeApi {
+
   final Dio _dio;
 
   final Serializers _serializers;
@@ -52,7 +53,8 @@ class FakeApi {
       validateStatus: validateStatus,
     );
 
-    final _queryParameters = <String, dynamic>{};
+    final _queryParameters = <String, dynamic>{
+    };
 
     final _response = await _dio.request<Object>(
       _path,
@@ -71,6 +73,7 @@ class FakeApi {
         _response.data!,
         specifiedType: _responseType,
       ) as HealthCheckResult;
+
     } catch (error) {
       throw DioError(
         requestOptions: _response.requestOptions,
@@ -138,6 +141,7 @@ class FakeApi {
     try {
       const _type = FullType(Pet);
       _bodyData = _serializers.serialize(pet, specifiedType: _type);
+
     } catch(error) {
       throw DioError(
          requestOptions: _options.compose(
@@ -191,12 +195,14 @@ class FakeApi {
       validateStatus: validateStatus,
     );
 
-    final _queryParameters = <String, dynamic>{};
+    final _queryParameters = <String, dynamic>{
+    };
 
     dynamic _bodyData;
 
     try {
       _bodyData = body;
+
     } catch(error) {
       throw DioError(
          requestOptions: _options.compose(
@@ -223,6 +229,7 @@ class FakeApi {
 
     try {
       _responseData = _response.data as bool;
+
     } catch (error) {
       throw DioError(
         requestOptions: _response.requestOptions,
@@ -272,15 +279,15 @@ class FakeApi {
       validateStatus: validateStatus,
     );
 
-    final _queryParameters = <String, dynamic>{};
+    final _queryParameters = <String, dynamic>{
+    };
 
     dynamic _bodyData;
 
     try {
       const _type = FullType(OuterComposite);
-      _bodyData = outerComposite == null
+      _bodyData = outerComposite == null ? null : _serializers.serialize(outerComposite, specifiedType: _type);
-          ? null
+
-          : _serializers.serialize(outerComposite, specifiedType: _type);
     } catch(error) {
       throw DioError(
          requestOptions: _options.compose(
@@ -311,6 +318,7 @@ class FakeApi {
         _response.data!,
         specifiedType: _responseType,
       ) as OuterComposite;
+
     } catch (error) {
       throw DioError(
         requestOptions: _response.requestOptions,
@@ -360,12 +368,14 @@ class FakeApi {
       validateStatus: validateStatus,
     );
 
-    final _queryParameters = <String, dynamic>{};
+    final _queryParameters = <String, dynamic>{
+    };
 
     dynamic _bodyData;
 
     try {
       _bodyData = body;
+
     } catch(error) {
       throw DioError(
          requestOptions: _options.compose(
@@ -392,6 +402,7 @@ class FakeApi {
 
     try {
       _responseData = _response.data as num;
+
     } catch (error) {
       throw DioError(
         requestOptions: _response.requestOptions,
@@ -441,12 +452,14 @@ class FakeApi {
       validateStatus: validateStatus,
     );
 
-    final _queryParameters = <String, dynamic>{};
+    final _queryParameters = <String, dynamic>{
+    };
 
     dynamic _bodyData;
 
     try {
       _bodyData = body;
+
     } catch(error) {
       throw DioError(
          requestOptions: _options.compose(
@@ -473,6 +486,7 @@ class FakeApi {
 
     try {
       _responseData = _response.data as String;
+
     } catch (error) {
       throw DioError(
         requestOptions: _response.requestOptions,
@@ -497,8 +511,7 @@ class FakeApi {
   /// 
   ///
   /// Test serialization of enum (int) properties with examples
-  Future<Response<OuterObjectWithEnumProperty>>
+  Future<Response<OuterObjectWithEnumProperty>> fakePropertyEnumIntegerSerialize({ 
-      fakePropertyEnumIntegerSerialize({
     required OuterObjectWithEnumProperty outerObjectWithEnumProperty,
     CancelToken? cancelToken,
     Map<String, dynamic>? headers,
@@ -523,14 +536,15 @@ class FakeApi {
       validateStatus: validateStatus,
     );
 
-    final _queryParameters = <String, dynamic>{};
+    final _queryParameters = <String, dynamic>{
+    };
 
     dynamic _bodyData;
 
     try {
       const _type = FullType(OuterObjectWithEnumProperty);
-      _bodyData = _serializers.serialize(outerObjectWithEnumProperty,
+      _bodyData = _serializers.serialize(outerObjectWithEnumProperty, specifiedType: _type);
-          specifiedType: _type);
+
     } catch(error) {
       throw DioError(
          requestOptions: _options.compose(
@@ -561,6 +575,7 @@ class FakeApi {
         _response.data!,
         specifiedType: _responseType,
       ) as OuterObjectWithEnumProperty;
+
     } catch (error) {
       throw DioError(
         requestOptions: _response.requestOptions,
@@ -610,14 +625,15 @@ class FakeApi {
       validateStatus: validateStatus,
     );
 
-    final _queryParameters = <String, dynamic>{};
+    final _queryParameters = <String, dynamic>{
+    };
 
     dynamic _bodyData;
 
     try {
       const _type = FullType(FileSchemaTestClass);
-      _bodyData =
+      _bodyData = _serializers.serialize(fileSchemaTestClass, specifiedType: _type);
-          _serializers.serialize(fileSchemaTestClass, specifiedType: _type);
+
     } catch(error) {
       throw DioError(
          requestOptions: _options.compose(
@@ -681,6 +697,7 @@ class FakeApi {
     try {
       const _type = FullType(User);
       _bodyData = _serializers.serialize(user, specifiedType: _type);
+
     } catch(error) {
       throw DioError(
          requestOptions: _options.compose(
@@ -734,13 +751,15 @@ class FakeApi {
       validateStatus: validateStatus,
     );
 
-    final _queryParameters = <String, dynamic>{};
+    final _queryParameters = <String, dynamic>{
+    };
 
     dynamic _bodyData;
 
     try {
       const _type = FullType(ModelClient);
       _bodyData = _serializers.serialize(modelClient, specifiedType: _type);
+
     } catch(error) {
       throw DioError(
          requestOptions: _options.compose(
@@ -771,6 +790,7 @@ class FakeApi {
         _response.data!,
         specifiedType: _responseType,
       ) as ModelClient;
+
     } catch (error) {
       throw DioError(
         requestOptions: _response.requestOptions,
@@ -838,50 +858,29 @@ class FakeApi {
       validateStatus: validateStatus,
     );
 
-    final _queryParameters = <String, dynamic>{};
+    final _queryParameters = <String, dynamic>{
+    };
 
     dynamic _bodyData;
 
     try {
       _bodyData = <String, dynamic>{
-        if (integer != null)
+        if (integer != null) r'integer': encodeFormParameter(_serializers, integer, const FullType(int)),
-          r'integer':
+        if (int32 != null) r'int32': encodeFormParameter(_serializers, int32, const FullType(int)),
-              encodeFormParameter(_serializers, integer, const FullType(int)),
+        if (int64 != null) r'int64': encodeFormParameter(_serializers, int64, const FullType(int)),
-        if (int32 != null)
+        r'number': encodeFormParameter(_serializers, number, const FullType(num)),
-          r'int32':
+        if (float != null) r'float': encodeFormParameter(_serializers, float, const FullType(double)),
-              encodeFormParameter(_serializers, int32, const FullType(int)),
+        r'double': encodeFormParameter(_serializers, double_, const FullType(double)),
-        if (int64 != null)
+        if (string != null) r'string': encodeFormParameter(_serializers, string, const FullType(String)),
-          r'int64':
+        r'pattern_without_delimiter': encodeFormParameter(_serializers, patternWithoutDelimiter, const FullType(String)),
-              encodeFormParameter(_serializers, int64, const FullType(int)),
+        r'byte': encodeFormParameter(_serializers, byte, const FullType(String)),
-        r'number':
+        if (binary != null) r'binary': MultipartFile.fromBytes(binary, filename: r'binary'),
-            encodeFormParameter(_serializers, number, const FullType(num)),
+        if (date != null) r'date': encodeFormParameter(_serializers, date, const FullType(DateTime)),
-        if (float != null)
+        if (dateTime != null) r'dateTime': encodeFormParameter(_serializers, dateTime, const FullType(DateTime)),
-          r'float':
+        if (password != null) r'password': encodeFormParameter(_serializers, password, const FullType(String)),
-              encodeFormParameter(_serializers, float, const FullType(double)),
+        if (callback != null) r'callback': encodeFormParameter(_serializers, callback, const FullType(String)),
-        r'double':
-            encodeFormParameter(_serializers, double_, const FullType(double)),
-        if (string != null)
-          r'string':
-              encodeFormParameter(_serializers, string, const FullType(String)),
-        r'pattern_without_delimiter': encodeFormParameter(
-            _serializers, patternWithoutDelimiter, const FullType(String)),
-        r'byte':
-            encodeFormParameter(_serializers, byte, const FullType(String)),
-        if (binary != null)
-          r'binary': MultipartFile.fromBytes(binary, filename: r'binary'),
-        if (date != null)
-          r'date':
-              encodeFormParameter(_serializers, date, const FullType(DateTime)),
-        if (dateTime != null)
-          r'dateTime': encodeFormParameter(
-              _serializers, dateTime, const FullType(DateTime)),
-        if (password != null)
-          r'password': encodeFormParameter(
-              _serializers, password, const FullType(String)),
-        if (callback != null)
-          r'callback': encodeFormParameter(
-              _serializers, callback, const FullType(String)),
       };
+
     } catch(error) {
       throw DioError(
          requestOptions: _options.compose(
@@ -930,8 +929,7 @@ class FakeApi {
     final _options = Options(
       method: r'GET',
       headers: <String, dynamic>{
-        if (enumHeaderStringArray != null)
+        if (enumHeaderStringArray != null) r'enum_header_string_array': enumHeaderStringArray,
-          r'enum_header_string_array': enumHeaderStringArray,
         if (enumHeaderString != null) r'enum_header_string': enumHeaderString,
         ...?headers,
       },
@@ -946,8 +944,7 @@ class FakeApi {
     );
 
     final _queryParameters = <String, dynamic>{
-      if (enumQueryStringArray != null)
+      if (enumQueryStringArray != null) r'enum_query_string_array': enumQueryStringArray,
-        r'enum_query_string_array': enumQueryStringArray,
       if (enumQueryString != null) r'enum_query_string': enumQueryString,
       if (enumQueryInteger != null) r'enum_query_integer': enumQueryInteger,
       if (enumQueryDouble != null) r'enum_query_double': enumQueryDouble,
@@ -957,15 +954,10 @@ class FakeApi {
 
     try {
       _bodyData = <String, dynamic>{
-        if (enumFormStringArray != null)
+        if (enumFormStringArray != null) r'enum_form_string_array': encodeFormParameter(_serializers, enumFormStringArray, const FullType(BuiltList, [FullType(String)])),
-          r'enum_form_string_array': encodeFormParameter(
+        if (enumFormString != null) r'enum_form_string': encodeFormParameter(_serializers, enumFormString, const FullType(String)),
-              _serializers,
-              enumFormStringArray,
-              const FullType(BuiltList, [FullType(String)])),
-        if (enumFormString != null)
-          r'enum_form_string': encodeFormParameter(
-              _serializers, enumFormString, const FullType(String)),
       };
+
     } catch(error) {
       throw DioError(
          requestOptions: _options.compose(
@@ -1078,13 +1070,15 @@ class FakeApi {
       validateStatus: validateStatus,
     );
 
-    final _queryParameters = <String, dynamic>{};
+    final _queryParameters = <String, dynamic>{
+    };
 
     dynamic _bodyData;
 
     try {
       const _type = FullType(BuiltMap, [FullType(String), FullType(String)]);
       _bodyData = _serializers.serialize(requestBody, specifiedType: _type);
+
     } catch(error) {
       throw DioError(
          requestOptions: _options.compose(
@@ -1139,17 +1133,17 @@ class FakeApi {
       validateStatus: validateStatus,
     );
 
-    final _queryParameters = <String, dynamic>{};
+    final _queryParameters = <String, dynamic>{
+    };
 
     dynamic _bodyData;
 
     try {
       _bodyData = <String, dynamic>{
-        r'param':
+        r'param': encodeFormParameter(_serializers, param, const FullType(String)),
-            encodeFormParameter(_serializers, param, const FullType(String)),
+        r'param2': encodeFormParameter(_serializers, param2, const FullType(String)),
-        r'param2':
-            encodeFormParameter(_serializers, param2, const FullType(String)),
       };
+
     } catch(error) {
       throw DioError(
          requestOptions: _options.compose(
@@ -1226,4 +1220,5 @@ class FakeApi {
 
     return _response;
   }
+
 }

samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/api/fake_classname_tags123_api.dart

@@ -10,6 +10,7 @@ import 'package:dio/dio.dart';
 import 'package:openapi/src/model/model_client.dart';
 
 class FakeClassnameTags123Api {
+
   final Dio _dio;
 
   final Serializers _serializers;
@@ -51,13 +52,15 @@ class FakeClassnameTags123Api {
       validateStatus: validateStatus,
     );
 
-    final _queryParameters = <String, dynamic>{};
+    final _queryParameters = <String, dynamic>{
+    };
 
     dynamic _bodyData;
 
     try {
       const _type = FullType(ModelClient);
       _bodyData = _serializers.serialize(modelClient, specifiedType: _type);
+
     } catch(error) {
       throw DioError(
          requestOptions: _options.compose(
@@ -88,6 +91,7 @@ class FakeClassnameTags123Api {
         _response.data!,
         specifiedType: _responseType,
       ) as ModelClient;
+
     } catch (error) {
       throw DioError(
         requestOptions: _response.requestOptions,
@@ -108,4 +112,5 @@ class FakeClassnameTags123Api {
       extra: _response.extra,
     );
   }
+
 }

samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/api/pet_api.dart

@@ -14,6 +14,7 @@ import 'dart:typed_data';
 import 'package:built_collection/built_collection.dart';
 
 class PetApi {
+
   final Dio _dio;
 
   final Serializers _serializers;
@@ -54,13 +55,15 @@ class PetApi {
       validateStatus: validateStatus,
     );
 
-    final _queryParameters = <String, dynamic>{};
+    final _queryParameters = <String, dynamic>{
+    };
 
     dynamic _bodyData;
 
     try {
       const _type = FullType(Pet);
       _bodyData = _serializers.serialize(pet, specifiedType: _type);
+
     } catch(error) {
       throw DioError(
          requestOptions: _options.compose(
@@ -99,8 +102,7 @@ class PetApi {
     ProgressCallback? onSendProgress,
     ProgressCallback? onReceiveProgress,
   }) async {
-    final _path =
+    final _path = r'/pet/{petId}'.replaceAll('{' r'petId' '}', petId.toString());
-        r'/pet/{petId}'.replaceAll('{' r'petId' '}', petId.toString());
     final _options = Options(
       method: r'DELETE',
       headers: <String, dynamic>{
@@ -122,7 +124,8 @@ class PetApi {
       validateStatus: validateStatus,
     );
 
-    final _queryParameters = <String, dynamic>{};
+    final _queryParameters = <String, dynamic>{
+    };
 
     final _response = await _dio.request<Object>(
       _path,
@@ -190,6 +193,7 @@ class PetApi {
         _response.data!,
         specifiedType: _responseType,
       ) as BuiltList<Pet>;
+
     } catch (error) {
       throw DioError(
         requestOptions: _response.requestOptions,
@@ -265,6 +269,7 @@ class PetApi {
         _response.data!,
         specifiedType: _responseType,
       ) as BuiltSet<Pet>;
+
     } catch (error) {
       throw DioError(
         requestOptions: _response.requestOptions,
@@ -298,8 +303,7 @@ class PetApi {
     ProgressCallback? onSendProgress,
     ProgressCallback? onReceiveProgress,
   }) async {
-    final _path =
+    final _path = r'/pet/{petId}'.replaceAll('{' r'petId' '}', petId.toString());
-        r'/pet/{petId}'.replaceAll('{' r'petId' '}', petId.toString());
     final _options = Options(
       method: r'GET',
       headers: <String, dynamic>{
@@ -322,7 +326,8 @@ class PetApi {
       validateStatus: validateStatus,
     );
 
-    final _queryParameters = <String, dynamic>{};
+    final _queryParameters = <String, dynamic>{
+    };
 
     final _response = await _dio.request<Object>(
       _path,
@@ -341,6 +346,7 @@ class PetApi {
         _response.data!,
         specifiedType: _responseType,
       ) as Pet;
+
     } catch (error) {
       throw DioError(
         requestOptions: _response.requestOptions,
@@ -396,13 +402,15 @@ class PetApi {
       validateStatus: validateStatus,
     );
 
-    final _queryParameters = <String, dynamic>{};
+    final _queryParameters = <String, dynamic>{
+    };
 
     dynamic _bodyData;
 
     try {
       const _type = FullType(Pet);
       _bodyData = _serializers.serialize(pet, specifiedType: _type);
+
     } catch(error) {
       throw DioError(
          requestOptions: _options.compose(
@@ -442,8 +450,7 @@ class PetApi {
     ProgressCallback? onSendProgress,
     ProgressCallback? onReceiveProgress,
   }) async {
-    final _path =
+    final _path = r'/pet/{petId}'.replaceAll('{' r'petId' '}', petId.toString());
-        r'/pet/{petId}'.replaceAll('{' r'petId' '}', petId.toString());
     final _options = Options(
       method: r'POST',
       headers: <String, dynamic>{
@@ -464,19 +471,17 @@ class PetApi {
       validateStatus: validateStatus,
     );
 
-    final _queryParameters = <String, dynamic>{};
+    final _queryParameters = <String, dynamic>{
+    };
 
     dynamic _bodyData;
 
     try {
       _bodyData = <String, dynamic>{
-        if (name != null)
+        if (name != null) r'name': encodeFormParameter(_serializers, name, const FullType(String)),
-          r'name':
+        if (status != null) r'status': encodeFormParameter(_serializers, status, const FullType(String)),
-              encodeFormParameter(_serializers, name, const FullType(String)),
-        if (status != null)
-          r'status':
-              encodeFormParameter(_serializers, status, const FullType(String)),
       };
+
     } catch(error) {
       throw DioError(
          requestOptions: _options.compose(
@@ -516,8 +521,7 @@ class PetApi {
     ProgressCallback? onSendProgress,
     ProgressCallback? onReceiveProgress,
   }) async {
-    final _path = r'/pet/{petId}/uploadImage'
+    final _path = r'/pet/{petId}/uploadImage'.replaceAll('{' r'petId' '}', petId.toString());
-        .replaceAll('{' r'petId' '}', petId.toString());
     final _options = Options(
       method: r'POST',
       headers: <String, dynamic>{
@@ -538,18 +542,17 @@ class PetApi {
       validateStatus: validateStatus,
     );
 
-    final _queryParameters = <String, dynamic>{};
+    final _queryParameters = <String, dynamic>{
+    };
 
     dynamic _bodyData;
 
     try {
       _bodyData = FormData.fromMap(<String, dynamic>{
-        if (additionalMetadata != null)
+        if (additionalMetadata != null) r'additionalMetadata': encodeFormParameter(_serializers, additionalMetadata, const FullType(String)),
-          r'additionalMetadata': encodeFormParameter(
+        if (file != null) r'file': MultipartFile.fromBytes(file, filename: r'file'),
-              _serializers, additionalMetadata, const FullType(String)),
-        if (file != null)
-          r'file': MultipartFile.fromBytes(file, filename: r'file'),
       });
+
     } catch(error) {
       throw DioError(
          requestOptions: _options.compose(
@@ -580,6 +583,7 @@ class PetApi {
         _response.data!,
         specifiedType: _responseType,
       ) as ApiResponse;
+
     } catch (error) {
       throw DioError(
         requestOptions: _response.requestOptions,
@@ -615,8 +619,7 @@ class PetApi {
     ProgressCallback? onSendProgress,
     ProgressCallback? onReceiveProgress,
   }) async {
-    final _path = r'/fake/{petId}/uploadImageWithRequiredFile'
+    final _path = r'/fake/{petId}/uploadImageWithRequiredFile'.replaceAll('{' r'petId' '}', petId.toString());
-        .replaceAll('{' r'petId' '}', petId.toString());
     final _options = Options(
       method: r'POST',
       headers: <String, dynamic>{
@@ -637,18 +640,17 @@ class PetApi {
       validateStatus: validateStatus,
     );
 
-    final _queryParameters = <String, dynamic>{};
+    final _queryParameters = <String, dynamic>{
+    };
 
     dynamic _bodyData;
 
     try {
       _bodyData = FormData.fromMap(<String, dynamic>{
-        if (additionalMetadata != null)
+        if (additionalMetadata != null) r'additionalMetadata': encodeFormParameter(_serializers, additionalMetadata, const FullType(String)),
-          r'additionalMetadata': encodeFormParameter(
+        r'requiredFile': MultipartFile.fromBytes(requiredFile, filename: r'requiredFile'),
-              _serializers, additionalMetadata, const FullType(String)),
-        r'requiredFile':
-            MultipartFile.fromBytes(requiredFile, filename: r'requiredFile'),
       });
+
     } catch(error) {
       throw DioError(
          requestOptions: _options.compose(
@@ -679,6 +681,7 @@ class PetApi {
         _response.data!,
         specifiedType: _responseType,
       ) as ApiResponse;
+
     } catch (error) {
       throw DioError(
         requestOptions: _response.requestOptions,
@@ -699,4 +702,5 @@ class PetApi {
       extra: _response.extra,
     );
   }
+
 }

samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/api/store_api.dart

@@ -11,6 +11,7 @@ import 'package:openapi/src/model/order.dart';
 import 'package:built_collection/built_collection.dart';
 
 class StoreApi {
+
   final Dio _dio;
 
   final Serializers _serializers;
@@ -29,8 +30,7 @@ class StoreApi {
     ProgressCallback? onSendProgress,
     ProgressCallback? onReceiveProgress,
   }) async {
-    final _path = r'/store/order/{order_id}'
+    final _path = r'/store/order/{order_id}'.replaceAll('{' r'order_id' '}', orderId.toString());
-        .replaceAll('{' r'order_id' '}', orderId.toString());
     final _options = Options(
       method: r'DELETE',
       headers: <String, dynamic>{
@@ -46,7 +46,8 @@ class StoreApi {
       validateStatus: validateStatus,
     );
 
-    final _queryParameters = <String, dynamic>{};
+    final _queryParameters = <String, dynamic>{
+    };
 
     final _response = await _dio.request<Object>(
       _path,
@@ -94,7 +95,8 @@ class StoreApi {
       validateStatus: validateStatus,
     );
 
-    final _queryParameters = <String, dynamic>{};
+    final _queryParameters = <String, dynamic>{
+    };
 
     final _response = await _dio.request<Object>(
       _path,
@@ -108,12 +110,12 @@ class StoreApi {
     BuiltMap<String, int> _responseData;
 
     try {
-      const _responseType =
+      const _responseType = FullType(BuiltMap, [FullType(String), FullType(int)]);
-          FullType(BuiltMap, [FullType(String), FullType(int)]);
       _responseData = _serializers.deserialize(
         _response.data!,
         specifiedType: _responseType,
       ) as BuiltMap<String, int>;
+
     } catch (error) {
       throw DioError(
         requestOptions: _response.requestOptions,
@@ -147,8 +149,7 @@ class StoreApi {
     ProgressCallback? onSendProgress,
     ProgressCallback? onReceiveProgress,
   }) async {
-    final _path = r'/store/order/{order_id}'
+    final _path = r'/store/order/{order_id}'.replaceAll('{' r'order_id' '}', orderId.toString());
-        .replaceAll('{' r'order_id' '}', orderId.toString());
     final _options = Options(
       method: r'GET',
       headers: <String, dynamic>{
@@ -164,7 +165,8 @@ class StoreApi {
       validateStatus: validateStatus,
     );
 
-    final _queryParameters = <String, dynamic>{};
+    final _queryParameters = <String, dynamic>{
+    };
 
     final _response = await _dio.request<Object>(
       _path,
@@ -183,6 +185,7 @@ class StoreApi {
         _response.data!,
         specifiedType: _responseType,
       ) as Order;
+
     } catch (error) {
       throw DioError(
         requestOptions: _response.requestOptions,
@@ -232,13 +235,15 @@ class StoreApi {
       validateStatus: validateStatus,
     );
 
-    final _queryParameters = <String, dynamic>{};
+    final _queryParameters = <String, dynamic>{
+    };
 
     dynamic _bodyData;
 
     try {
       const _type = FullType(Order);
       _bodyData = _serializers.serialize(order, specifiedType: _type);
+
     } catch(error) {
       throw DioError(
          requestOptions: _options.compose(
@@ -269,6 +274,7 @@ class StoreApi {
         _response.data!,
         specifiedType: _responseType,
       ) as Order;
+
     } catch (error) {
       throw DioError(
         requestOptions: _response.requestOptions,
@@ -289,4 +295,5 @@ class StoreApi {
       extra: _response.extra,
     );
   }
+
 }

samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/api/user_api.dart

@@ -11,6 +11,7 @@ import 'package:openapi/src/model/user.dart';
 import 'package:built_collection/built_collection.dart';
 
 class UserApi {
+
   final Dio _dio;
 
   final Serializers _serializers;
@@ -45,13 +46,15 @@ class UserApi {
       validateStatus: validateStatus,
     );
 
-    final _queryParameters = <String, dynamic>{};
+    final _queryParameters = <String, dynamic>{
+    };
 
     dynamic _bodyData;
 
     try {
       const _type = FullType(User);
       _bodyData = _serializers.serialize(user, specifiedType: _type);
+
     } catch(error) {
       throw DioError(
          requestOptions: _options.compose(
@@ -105,13 +108,15 @@ class UserApi {
       validateStatus: validateStatus,
     );
 
-    final _queryParameters = <String, dynamic>{};
+    final _queryParameters = <String, dynamic>{
+    };
 
     dynamic _bodyData;
 
     try {
       const _type = FullType(BuiltList, [FullType(User)]);
       _bodyData = _serializers.serialize(user, specifiedType: _type);
+
     } catch(error) {
       throw DioError(
          requestOptions: _options.compose(
@@ -165,13 +170,15 @@ class UserApi {
       validateStatus: validateStatus,
     );
 
-    final _queryParameters = <String, dynamic>{};
+    final _queryParameters = <String, dynamic>{
+    };
 
     dynamic _bodyData;
 
     try {
       const _type = FullType(BuiltList, [FullType(User)]);
       _bodyData = _serializers.serialize(user, specifiedType: _type);
+
     } catch(error) {
       throw DioError(
          requestOptions: _options.compose(
@@ -209,8 +216,7 @@ class UserApi {
     ProgressCallback? onSendProgress,
     ProgressCallback? onReceiveProgress,
   }) async {
-    final _path = r'/user/{username}'
+    final _path = r'/user/{username}'.replaceAll('{' r'username' '}', username.toString());
-        .replaceAll('{' r'username' '}', username.toString());
     final _options = Options(
       method: r'DELETE',
       headers: <String, dynamic>{
@@ -226,7 +232,8 @@ class UserApi {
       validateStatus: validateStatus,
     );
 
-    final _queryParameters = <String, dynamic>{};
+    final _queryParameters = <String, dynamic>{
+    };
 
     final _response = await _dio.request<Object>(
       _path,
@@ -252,8 +259,7 @@ class UserApi {
     ProgressCallback? onSendProgress,
     ProgressCallback? onReceiveProgress,
   }) async {
-    final _path = r'/user/{username}'
+    final _path = r'/user/{username}'.replaceAll('{' r'username' '}', username.toString());
-        .replaceAll('{' r'username' '}', username.toString());
     final _options = Options(
       method: r'GET',
       headers: <String, dynamic>{
@@ -269,7 +275,8 @@ class UserApi {
       validateStatus: validateStatus,
     );
 
-    final _queryParameters = <String, dynamic>{};
+    final _queryParameters = <String, dynamic>{
+    };
 
     final _response = await _dio.request<Object>(
       _path,
@@ -288,6 +295,7 @@ class UserApi {
         _response.data!,
         specifiedType: _responseType,
       ) as User;
+
     } catch (error) {
       throw DioError(
         requestOptions: _response.requestOptions,
@@ -356,6 +364,7 @@ class UserApi {
 
     try {
       _responseData = _response.data as String;
+
     } catch (error) {
       throw DioError(
         requestOptions: _response.requestOptions,
@@ -404,7 +413,8 @@ class UserApi {
       validateStatus: validateStatus,
     );
 
-    final _queryParameters = <String, dynamic>{};
+    final _queryParameters = <String, dynamic>{
+    };
 
     final _response = await _dio.request<Object>(
       _path,
@@ -431,8 +441,7 @@ class UserApi {
     ProgressCallback? onSendProgress,
     ProgressCallback? onReceiveProgress,
   }) async {
-    final _path = r'/user/{username}'
+    final _path = r'/user/{username}'.replaceAll('{' r'username' '}', username.toString());
-        .replaceAll('{' r'username' '}', username.toString());
     final _options = Options(
       method: r'PUT',
       headers: <String, dynamic>{
@@ -448,13 +457,15 @@ class UserApi {
       validateStatus: validateStatus,
     );
 
-    final _queryParameters = <String, dynamic>{};
+    final _queryParameters = <String, dynamic>{
+    };
 
     dynamic _bodyData;
 
     try {
       const _type = FullType(User);
       _bodyData = _serializers.serialize(user, specifiedType: _type);
+
     } catch(error) {
       throw DioError(
          requestOptions: _options.compose(
@@ -479,4 +490,5 @@ class UserApi {
 
     return _response;
   }
+
 }

samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/api_util.dart

@@ -10,8 +10,7 @@ import 'package:built_value/serializer.dart';
 /// Format the given form parameter object into something that Dio can handle.
 /// Returns primitive or String.
 /// Returns List/Map if the value is BuildList/BuiltMap.
-dynamic encodeFormParameter(
+dynamic encodeFormParameter(Serializers serializers, dynamic value, FullType type) {
-    Serializers serializers, dynamic value, FullType type) {
   if (value == null) {
     return '';
   }

samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/auth/api_key_auth.dart

@@ -2,6 +2,7 @@
 // AUTO-GENERATED FILE, DO NOT MODIFY!
 //
 
+
 import 'package:dio/dio.dart';
 import 'package:openapi/src/auth/auth.dart';
 

samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/auth/basic_auth.dart

@@ -27,8 +27,7 @@ class BasicAuthInterceptor extends AuthInterceptor {
       final authName = info['name'] as String;
       final basicAuthInfo = authInfo[authName];
       if (basicAuthInfo != null) {
-        final basicAuth =
+        final basicAuth = 'Basic ${base64Encode(utf8.encode('${basicAuthInfo.username}:${basicAuthInfo.password}'))}';
-            'Basic ${base64Encode(utf8.encode('${basicAuthInfo.username}:${basicAuthInfo.password}'))}';
         options.headers['Authorization'] = basicAuth;
         break;
       }

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

@@ -8,9 +8,9 @@ import 'package:built_value/serializer.dart';
 
 part 'additional_properties_class.g.dart';
 
-abstract class AdditionalPropertiesClass
+
-    implements
+
-        Built<AdditionalPropertiesClass, AdditionalPropertiesClassBuilder> {
+abstract class AdditionalPropertiesClass implements Built<AdditionalPropertiesClass, AdditionalPropertiesClassBuilder> {
     @BuiltValueField(wireName: r'map_property')
     BuiltMap<String, String>? get mapProperty;
 
@@ -21,53 +21,40 @@ abstract class AdditionalPropertiesClass
 
     static void _initializeBuilder(AdditionalPropertiesClassBuilder b) => b;
 
-  factory AdditionalPropertiesClass(
+    factory AdditionalPropertiesClass([void updates(AdditionalPropertiesClassBuilder b)]) = _$AdditionalPropertiesClass;
-          [void updates(AdditionalPropertiesClassBuilder b)]) =
-      _$AdditionalPropertiesClass;
 
     @BuiltValueSerializer(custom: true)
-  static Serializer<AdditionalPropertiesClass> get serializer =>
+    static Serializer<AdditionalPropertiesClass> get serializer => _$AdditionalPropertiesClassSerializer();
-      _$AdditionalPropertiesClassSerializer();
 }
 
-class _$AdditionalPropertiesClassSerializer
+class _$AdditionalPropertiesClassSerializer implements StructuredSerializer<AdditionalPropertiesClass> {
-    implements StructuredSerializer<AdditionalPropertiesClass> {
     @override
-  final Iterable<Type> types = const [
+    final Iterable<Type> types = const [AdditionalPropertiesClass, _$AdditionalPropertiesClass];
-    AdditionalPropertiesClass,
-    _$AdditionalPropertiesClass
-  ];
 
     @override
     final String wireName = r'AdditionalPropertiesClass';
 
     @override
-  Iterable<Object?> serialize(
+    Iterable<Object?> serialize(Serializers serializers, AdditionalPropertiesClass object,
-      Serializers serializers, AdditionalPropertiesClass object,
         {FullType specifiedType = FullType.unspecified}) {
         final result = <Object?>[];
         if (object.mapProperty != null) {
             result
                 ..add(r'map_property')
                 ..add(serializers.serialize(object.mapProperty,
-            specifiedType: const FullType(
+                    specifiedType: const FullType(BuiltMap, [FullType(String), FullType(String)])));
-                BuiltMap, [FullType(String), FullType(String)])));
         }
         if (object.mapOfMapProperty != null) {
             result
                 ..add(r'map_of_map_property')
                 ..add(serializers.serialize(object.mapOfMapProperty,
-            specifiedType: const FullType(BuiltMap, [
+                    specifiedType: const FullType(BuiltMap, [FullType(String), FullType(BuiltMap, [FullType(String), FullType(String)])])));
-              FullType(String),
-              FullType(BuiltMap, [FullType(String), FullType(String)])
-            ])));
         }
         return result;
     }
 
     @override
-  AdditionalPropertiesClass deserialize(
+    AdditionalPropertiesClass deserialize(Serializers serializers, Iterable<Object?> serialized,
-      Serializers serializers, Iterable<Object?> serialized,
         {FullType specifiedType = FullType.unspecified}) {
         final result = AdditionalPropertiesClassBuilder();
 
@@ -79,19 +66,15 @@ class _$AdditionalPropertiesClassSerializer
             switch (key) {
                 case r'map_property':
                     result.mapProperty.replace(serializers.deserialize(value,
-                  specifiedType: const FullType(
+                        specifiedType: const FullType(BuiltMap, [FullType(String), FullType(String)])) as BuiltMap<String, String>);
-                      BuiltMap, [FullType(String), FullType(String)]))
-              as BuiltMap<String, String>);
                     break;
                 case r'map_of_map_property':
                     result.mapOfMapProperty.replace(serializers.deserialize(value,
-              specifiedType: const FullType(BuiltMap, [
+                        specifiedType: const FullType(BuiltMap, [FullType(String), FullType(BuiltMap, [FullType(String), FullType(String)])])) as BuiltMap<String, BuiltMap<String, String>>);
-                FullType(String),
-                FullType(BuiltMap, [FullType(String), FullType(String)])
-              ])) as BuiltMap<String, BuiltMap<String, String>>);
                     break;
             }
         }
         return result.build();
     }
 }
+

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

@@ -7,6 +7,8 @@ import 'package:built_value/serializer.dart';
 
 part 'animal.g.dart';
 
+
+
 abstract class Animal implements Built<Animal, AnimalBuilder> {
     @BuiltValueField(wireName: r'className')
     String get className;
@@ -16,7 +18,8 @@ abstract class Animal implements Built<Animal, AnimalBuilder> {
 
     Animal._();
 
-  static void _initializeBuilder(AnimalBuilder b) => b..color = 'red';
+    static void _initializeBuilder(AnimalBuilder b) => b
+        ..color = 'red';
 
     factory Animal([void updates(AnimalBuilder b)]) = _$Animal;
 
@@ -72,3 +75,4 @@ class _$AnimalSerializer implements StructuredSerializer<Animal> {
         return result.build();
     }
 }
+

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

@@ -7,6 +7,8 @@ import 'package:built_value/serializer.dart';
 
 part 'api_response.g.dart';
 
+
+
 abstract class ApiResponse implements Built<ApiResponse, ApiResponseBuilder> {
     @BuiltValueField(wireName: r'code')
     int? get code;
@@ -87,3 +89,4 @@ class _$ApiResponseSerializer implements StructuredSerializer<ApiResponse> {
         return result.build();
     }
 }
+

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

@@ -8,9 +8,9 @@ import 'package:built_value/serializer.dart';
 
 part 'array_of_array_of_number_only.g.dart';
 
-abstract class ArrayOfArrayOfNumberOnly
+
-    implements
+
-        Built<ArrayOfArrayOfNumberOnly, ArrayOfArrayOfNumberOnlyBuilder> {
+abstract class ArrayOfArrayOfNumberOnly implements Built<ArrayOfArrayOfNumberOnly, ArrayOfArrayOfNumberOnlyBuilder> {
     @BuiltValueField(wireName: r'ArrayArrayNumber')
     BuiltList<BuiltList<num>>? get arrayArrayNumber;
 
@@ -18,45 +18,34 @@ abstract class ArrayOfArrayOfNumberOnly
 
     static void _initializeBuilder(ArrayOfArrayOfNumberOnlyBuilder b) => b;
 
-  factory ArrayOfArrayOfNumberOnly(
+    factory ArrayOfArrayOfNumberOnly([void updates(ArrayOfArrayOfNumberOnlyBuilder b)]) = _$ArrayOfArrayOfNumberOnly;
-          [void updates(ArrayOfArrayOfNumberOnlyBuilder b)]) =
-      _$ArrayOfArrayOfNumberOnly;
 
     @BuiltValueSerializer(custom: true)
-  static Serializer<ArrayOfArrayOfNumberOnly> get serializer =>
+    static Serializer<ArrayOfArrayOfNumberOnly> get serializer => _$ArrayOfArrayOfNumberOnlySerializer();
-      _$ArrayOfArrayOfNumberOnlySerializer();
 }
 
-class _$ArrayOfArrayOfNumberOnlySerializer
+class _$ArrayOfArrayOfNumberOnlySerializer implements StructuredSerializer<ArrayOfArrayOfNumberOnly> {
-    implements StructuredSerializer<ArrayOfArrayOfNumberOnly> {
     @override
-  final Iterable<Type> types = const [
+    final Iterable<Type> types = const [ArrayOfArrayOfNumberOnly, _$ArrayOfArrayOfNumberOnly];
-    ArrayOfArrayOfNumberOnly,
-    _$ArrayOfArrayOfNumberOnly
-  ];
 
     @override
     final String wireName = r'ArrayOfArrayOfNumberOnly';
 
     @override
-  Iterable<Object?> serialize(
+    Iterable<Object?> serialize(Serializers serializers, ArrayOfArrayOfNumberOnly object,
-      Serializers serializers, ArrayOfArrayOfNumberOnly object,
         {FullType specifiedType = FullType.unspecified}) {
         final result = <Object?>[];
         if (object.arrayArrayNumber != null) {
             result
                 ..add(r'ArrayArrayNumber')
                 ..add(serializers.serialize(object.arrayArrayNumber,
-            specifiedType: const FullType(BuiltList, [
+                    specifiedType: const FullType(BuiltList, [FullType(BuiltList, [FullType(num)])])));
-              FullType(BuiltList, [FullType(num)])
-            ])));
         }
         return result;
     }
 
     @override
-  ArrayOfArrayOfNumberOnly deserialize(
+    ArrayOfArrayOfNumberOnly deserialize(Serializers serializers, Iterable<Object?> serialized,
-      Serializers serializers, Iterable<Object?> serialized,
         {FullType specifiedType = FullType.unspecified}) {
         final result = ArrayOfArrayOfNumberOnlyBuilder();
 
@@ -68,12 +57,11 @@ class _$ArrayOfArrayOfNumberOnlySerializer
             switch (key) {
                 case r'ArrayArrayNumber':
                     result.arrayArrayNumber.replace(serializers.deserialize(value,
-              specifiedType: const FullType(BuiltList, [
+                        specifiedType: const FullType(BuiltList, [FullType(BuiltList, [FullType(num)])])) as BuiltList<BuiltList<num>>);
-                FullType(BuiltList, [FullType(num)])
-              ])) as BuiltList<BuiltList<num>>);
                     break;
             }
         }
         return result.build();
     }
 }
+

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

@@ -8,8 +8,9 @@ import 'package:built_value/serializer.dart';
 
 part 'array_of_number_only.g.dart';
 
-abstract class ArrayOfNumberOnly
+
-    implements Built<ArrayOfNumberOnly, ArrayOfNumberOnlyBuilder> {
+
+abstract class ArrayOfNumberOnly implements Built<ArrayOfNumberOnly, ArrayOfNumberOnlyBuilder> {
     @BuiltValueField(wireName: r'ArrayNumber')
     BuiltList<num>? get arrayNumber;
 
@@ -17,16 +18,13 @@ abstract class ArrayOfNumberOnly
 
     static void _initializeBuilder(ArrayOfNumberOnlyBuilder b) => b;
 
-  factory ArrayOfNumberOnly([void updates(ArrayOfNumberOnlyBuilder b)]) =
+    factory ArrayOfNumberOnly([void updates(ArrayOfNumberOnlyBuilder b)]) = _$ArrayOfNumberOnly;
-      _$ArrayOfNumberOnly;
 
     @BuiltValueSerializer(custom: true)
-  static Serializer<ArrayOfNumberOnly> get serializer =>
+    static Serializer<ArrayOfNumberOnly> get serializer => _$ArrayOfNumberOnlySerializer();
-      _$ArrayOfNumberOnlySerializer();
 }
 
-class _$ArrayOfNumberOnlySerializer
+class _$ArrayOfNumberOnlySerializer implements StructuredSerializer<ArrayOfNumberOnly> {
-    implements StructuredSerializer<ArrayOfNumberOnly> {
     @override
     final Iterable<Type> types = const [ArrayOfNumberOnly, _$ArrayOfNumberOnly];
 
@@ -47,8 +45,7 @@ class _$ArrayOfNumberOnlySerializer
     }
 
     @override
-  ArrayOfNumberOnly deserialize(
+    ArrayOfNumberOnly deserialize(Serializers serializers, Iterable<Object?> serialized,
-      Serializers serializers, Iterable<Object?> serialized,
         {FullType specifiedType = FullType.unspecified}) {
         final result = ArrayOfNumberOnlyBuilder();
 
@@ -60,11 +57,11 @@ class _$ArrayOfNumberOnlySerializer
             switch (key) {
                 case r'ArrayNumber':
                     result.arrayNumber.replace(serializers.deserialize(value,
-                  specifiedType: const FullType(BuiltList, [FullType(num)]))
+                        specifiedType: const FullType(BuiltList, [FullType(num)])) as BuiltList<num>);
-              as BuiltList<num>);
                     break;
             }
         }
         return result.build();
     }
 }
+

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

@@ -9,6 +9,8 @@ import 'package:built_value/serializer.dart';
 
 part 'array_test.g.dart';
 
+
+
 abstract class ArrayTest implements Built<ArrayTest, ArrayTestBuilder> {
     @BuiltValueField(wireName: r'array_of_string')
     BuiltList<String>? get arrayOfString;
@@ -50,17 +52,13 @@ class _$ArrayTestSerializer implements StructuredSerializer<ArrayTest> {
             result
                 ..add(r'array_array_of_integer')
                 ..add(serializers.serialize(object.arrayArrayOfInteger,
-            specifiedType: const FullType(BuiltList, [
+                    specifiedType: const FullType(BuiltList, [FullType(BuiltList, [FullType(int)])])));
-              FullType(BuiltList, [FullType(int)])
-            ])));
         }
         if (object.arrayArrayOfModel != null) {
             result
                 ..add(r'array_array_of_model')
                 ..add(serializers.serialize(object.arrayArrayOfModel,
-            specifiedType: const FullType(BuiltList, [
+                    specifiedType: const FullType(BuiltList, [FullType(BuiltList, [FullType(ReadOnlyFirst)])])));
-              FullType(BuiltList, [FullType(ReadOnlyFirst)])
-            ])));
         }
         return result;
     }
@@ -78,23 +76,19 @@ class _$ArrayTestSerializer implements StructuredSerializer<ArrayTest> {
             switch (key) {
                 case r'array_of_string':
                     result.arrayOfString.replace(serializers.deserialize(value,
-                  specifiedType: const FullType(BuiltList, [FullType(String)]))
+                        specifiedType: const FullType(BuiltList, [FullType(String)])) as BuiltList<String>);
-              as BuiltList<String>);
                     break;
                 case r'array_array_of_integer':
                     result.arrayArrayOfInteger.replace(serializers.deserialize(value,
-              specifiedType: const FullType(BuiltList, [
+                        specifiedType: const FullType(BuiltList, [FullType(BuiltList, [FullType(int)])])) as BuiltList<BuiltList<int>>);
-                FullType(BuiltList, [FullType(int)])
-              ])) as BuiltList<BuiltList<int>>);
                     break;
                 case r'array_array_of_model':
                     result.arrayArrayOfModel.replace(serializers.deserialize(value,
-              specifiedType: const FullType(BuiltList, [
+                        specifiedType: const FullType(BuiltList, [FullType(BuiltList, [FullType(ReadOnlyFirst)])])) as BuiltList<BuiltList<ReadOnlyFirst>>);
-                FullType(BuiltList, [FullType(ReadOnlyFirst)])
-              ])) as BuiltList<BuiltList<ReadOnlyFirst>>);
                     break;
             }
         }
         return result.build();
     }
 }
+

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

@@ -7,8 +7,9 @@ import 'package:built_value/serializer.dart';
 
 part 'capitalization.g.dart';
 
-abstract class Capitalization
+
-    implements Built<Capitalization, CapitalizationBuilder> {
+
+abstract class Capitalization implements Built<Capitalization, CapitalizationBuilder> {
     @BuiltValueField(wireName: r'smallCamel')
     String? get smallCamel;
 
@@ -32,16 +33,13 @@ abstract class Capitalization
 
     static void _initializeBuilder(CapitalizationBuilder b) => b;
 
-  factory Capitalization([void updates(CapitalizationBuilder b)]) =
+    factory Capitalization([void updates(CapitalizationBuilder b)]) = _$Capitalization;
-      _$Capitalization;
 
     @BuiltValueSerializer(custom: true)
-  static Serializer<Capitalization> get serializer =>
+    static Serializer<Capitalization> get serializer => _$CapitalizationSerializer();
-      _$CapitalizationSerializer();
 }
 
-class _$CapitalizationSerializer
+class _$CapitalizationSerializer implements StructuredSerializer<Capitalization> {
-    implements StructuredSerializer<Capitalization> {
     @override
     final Iterable<Type> types = const [Capitalization, _$Capitalization];
 
@@ -92,8 +90,7 @@ class _$CapitalizationSerializer
     }
 
     @override
-  Capitalization deserialize(
+    Capitalization deserialize(Serializers serializers, Iterable<Object?> serialized,
-      Serializers serializers, Iterable<Object?> serialized,
         {FullType specifiedType = FullType.unspecified}) {
         final result = CapitalizationBuilder();
 
@@ -132,3 +129,4 @@ class _$CapitalizationSerializer
         return result.build();
     }
 }
+

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

@@ -23,7 +23,8 @@ abstract class Cat implements Built<Cat, CatBuilder> {
 
     Cat._();
 
-  static void _initializeBuilder(CatBuilder b) => b..color = 'red';
+    static void _initializeBuilder(CatBuilder b) => b
+        ..color = 'red';
 
     factory Cat([void updates(CatBuilder b)]) = _$Cat;
 
@@ -89,3 +90,4 @@ class _$CatSerializer implements StructuredSerializer<Cat> {
         return result.build();
     }
 }
+

samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/cat_all_of.dart

@@ -7,6 +7,8 @@ import 'package:built_value/serializer.dart';
 
 part 'cat_all_of.g.dart';
 
+
+
 abstract class CatAllOf implements Built<CatAllOf, CatAllOfBuilder> {
     @BuiltValueField(wireName: r'declawed')
     bool? get declawed;
@@ -61,3 +63,4 @@ class _$CatAllOfSerializer implements StructuredSerializer<CatAllOf> {
         return result.build();
     }
 }
+

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

@@ -7,6 +7,8 @@ import 'package:built_value/serializer.dart';
 
 part 'category.g.dart';
 
+
+
 abstract class Category implements Built<Category, CategoryBuilder> {
     @BuiltValueField(wireName: r'id')
     int? get id;
@@ -16,7 +18,8 @@ abstract class Category implements Built<Category, CategoryBuilder> {
 
     Category._();
 
-  static void _initializeBuilder(CategoryBuilder b) => b..name = 'default-name';
+    static void _initializeBuilder(CategoryBuilder b) => b
+        ..name = 'default-name';
 
     factory Category([void updates(CategoryBuilder b)]) = _$Category;
 
@@ -72,3 +75,4 @@ class _$CategorySerializer implements StructuredSerializer<Category> {
         return result.build();
     }
 }
+

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

@@ -7,6 +7,8 @@ import 'package:built_value/serializer.dart';
 
 part 'class_model.g.dart';
 
+
+
 abstract class ClassModel implements Built<ClassModel, ClassModelBuilder> {
     @BuiltValueField(wireName: r'_class')
     String? get class_;
@@ -61,3 +63,4 @@ class _$ClassModelSerializer implements StructuredSerializer<ClassModel> {
         return result.build();
     }
 }
+

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

@@ -23,7 +23,8 @@ abstract class Dog implements Built<Dog, DogBuilder> {
 
     Dog._();
 
-  static void _initializeBuilder(DogBuilder b) => b..color = 'red';
+    static void _initializeBuilder(DogBuilder b) => b
+        ..color = 'red';
 
     factory Dog([void updates(DogBuilder b)]) = _$Dog;
 
@@ -89,3 +90,4 @@ class _$DogSerializer implements StructuredSerializer<Dog> {
         return result.build();
     }
 }
+

samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/dog_all_of.dart

@@ -7,6 +7,8 @@ import 'package:built_value/serializer.dart';
 
 part 'dog_all_of.g.dart';
 
+
+
 abstract class DogAllOf implements Built<DogAllOf, DogAllOfBuilder> {
     @BuiltValueField(wireName: r'breed')
     String? get breed;
@@ -61,3 +63,4 @@ class _$DogAllOfSerializer implements StructuredSerializer<DogAllOf> {
         return result.build();
     }
 }
+

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

@@ -8,6 +8,8 @@ import 'package:built_value/serializer.dart';
 
 part 'enum_arrays.g.dart';
 
+
+
 abstract class EnumArrays implements Built<EnumArrays, EnumArraysBuilder> {
     @BuiltValueField(wireName: r'just_symbol')
     EnumArraysJustSymbolEnum? get justSymbol;
@@ -48,8 +50,7 @@ class _$EnumArraysSerializer implements StructuredSerializer<EnumArrays> {
             result
                 ..add(r'array_enum')
                 ..add(serializers.serialize(object.arrayEnum,
-            specifiedType: const FullType(
+                    specifiedType: const FullType(BuiltList, [FullType(EnumArraysArrayEnumEnum)])));
-                BuiltList, [FullType(EnumArraysArrayEnumEnum)])));
         }
         return result;
     }
@@ -67,14 +68,11 @@ class _$EnumArraysSerializer implements StructuredSerializer<EnumArrays> {
             switch (key) {
                 case r'just_symbol':
                     result.justSymbol = serializers.deserialize(value,
-                  specifiedType: const FullType(EnumArraysJustSymbolEnum))
+                        specifiedType: const FullType(EnumArraysJustSymbolEnum)) as EnumArraysJustSymbolEnum;
-              as EnumArraysJustSymbolEnum;
                     break;
                 case r'array_enum':
                     result.arrayEnum.replace(serializers.deserialize(value,
-                  specifiedType: const FullType(
+                        specifiedType: const FullType(BuiltList, [FullType(EnumArraysArrayEnumEnum)])) as BuiltList<EnumArraysArrayEnumEnum>);
-                      BuiltList, [FullType(EnumArraysArrayEnumEnum)]))
-              as BuiltList<EnumArraysArrayEnumEnum>);
                     break;
             }
         }
@@ -83,37 +81,32 @@ class _$EnumArraysSerializer implements StructuredSerializer<EnumArrays> {
 }
 
 class EnumArraysJustSymbolEnum extends EnumClass {
-  @BuiltValueEnumConst(wireName: r'>=')
-  static const EnumArraysJustSymbolEnum greaterThanEqual =
-      _$enumArraysJustSymbolEnum_greaterThanEqual;
-  @BuiltValueEnumConst(wireName: r'$')
-  static const EnumArraysJustSymbolEnum dollar =
-      _$enumArraysJustSymbolEnum_dollar;
 
-  static Serializer<EnumArraysJustSymbolEnum> get serializer =>
+  @BuiltValueEnumConst(wireName: r'>=')
-      _$enumArraysJustSymbolEnumSerializer;
+  static const EnumArraysJustSymbolEnum greaterThanEqual = _$enumArraysJustSymbolEnum_greaterThanEqual;
+  @BuiltValueEnumConst(wireName: r'$')
+  static const EnumArraysJustSymbolEnum dollar = _$enumArraysJustSymbolEnum_dollar;
+
+  static Serializer<EnumArraysJustSymbolEnum> get serializer => _$enumArraysJustSymbolEnumSerializer;
 
   const EnumArraysJustSymbolEnum._(String name): super(name);
 
-  static BuiltSet<EnumArraysJustSymbolEnum> get values =>
+  static BuiltSet<EnumArraysJustSymbolEnum> get values => _$enumArraysJustSymbolEnumValues;
-      _$enumArraysJustSymbolEnumValues;
+  static EnumArraysJustSymbolEnum valueOf(String name) => _$enumArraysJustSymbolEnumValueOf(name);
-  static EnumArraysJustSymbolEnum valueOf(String name) =>
-      _$enumArraysJustSymbolEnumValueOf(name);
 }
 
 class EnumArraysArrayEnumEnum extends EnumClass {
+
   @BuiltValueEnumConst(wireName: r'fish')
   static const EnumArraysArrayEnumEnum fish = _$enumArraysArrayEnumEnum_fish;
   @BuiltValueEnumConst(wireName: r'crab')
   static const EnumArraysArrayEnumEnum crab = _$enumArraysArrayEnumEnum_crab;
 
-  static Serializer<EnumArraysArrayEnumEnum> get serializer =>
+  static Serializer<EnumArraysArrayEnumEnum> get serializer => _$enumArraysArrayEnumEnumSerializer;
-      _$enumArraysArrayEnumEnumSerializer;
 
   const EnumArraysArrayEnumEnum._(String name): super(name);
 
-  static BuiltSet<EnumArraysArrayEnumEnum> get values =>
+  static BuiltSet<EnumArraysArrayEnumEnum> get values => _$enumArraysArrayEnumEnumValues;
-      _$enumArraysArrayEnumEnumValues;
+  static EnumArraysArrayEnumEnum valueOf(String name) => _$enumArraysArrayEnumEnumValueOf(name);
-  static EnumArraysArrayEnumEnum valueOf(String name) =>
-      _$enumArraysArrayEnumEnumValueOf(name);
 }
+

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

@@ -12,6 +12,8 @@ import 'package:built_value/serializer.dart';
 
 part 'enum_test.g.dart';
 
+
+
 abstract class EnumTest implements Built<EnumTest, EnumTestBuilder> {
     @BuiltValueField(wireName: r'enum_string')
     EnumTestEnumStringEnum? get enumString;
@@ -128,23 +130,19 @@ class _$EnumTestSerializer implements StructuredSerializer<EnumTest> {
             switch (key) {
                 case r'enum_string':
                     result.enumString = serializers.deserialize(value,
-                  specifiedType: const FullType(EnumTestEnumStringEnum))
+                        specifiedType: const FullType(EnumTestEnumStringEnum)) as EnumTestEnumStringEnum;
-              as EnumTestEnumStringEnum;
                     break;
                 case r'enum_string_required':
                     result.enumStringRequired = serializers.deserialize(value,
-                  specifiedType: const FullType(EnumTestEnumStringRequiredEnum))
+                        specifiedType: const FullType(EnumTestEnumStringRequiredEnum)) as EnumTestEnumStringRequiredEnum;
-              as EnumTestEnumStringRequiredEnum;
                     break;
                 case r'enum_integer':
                     result.enumInteger = serializers.deserialize(value,
-                  specifiedType: const FullType(EnumTestEnumIntegerEnum))
+                        specifiedType: const FullType(EnumTestEnumIntegerEnum)) as EnumTestEnumIntegerEnum;
-              as EnumTestEnumIntegerEnum;
                     break;
                 case r'enum_number':
                     result.enumNumber = serializers.deserialize(value,
-                  specifiedType: const FullType(EnumTestEnumNumberEnum))
+                        specifiedType: const FullType(EnumTestEnumNumberEnum)) as EnumTestEnumNumberEnum;
-              as EnumTestEnumNumberEnum;
                     break;
                 case r'outerEnum':
                     result.outerEnum = serializers.deserialize(value,
@@ -152,18 +150,15 @@ class _$EnumTestSerializer implements StructuredSerializer<EnumTest> {
                     break;
                 case r'outerEnumInteger':
                     result.outerEnumInteger = serializers.deserialize(value,
-                  specifiedType: const FullType(OuterEnumInteger))
+                        specifiedType: const FullType(OuterEnumInteger)) as OuterEnumInteger;
-              as OuterEnumInteger;
                     break;
                 case r'outerEnumDefaultValue':
                     result.outerEnumDefaultValue = serializers.deserialize(value,
-                  specifiedType: const FullType(OuterEnumDefaultValue))
+                        specifiedType: const FullType(OuterEnumDefaultValue)) as OuterEnumDefaultValue;
-              as OuterEnumDefaultValue;
                     break;
                 case r'outerEnumIntegerDefaultValue':
                     result.outerEnumIntegerDefaultValue = serializers.deserialize(value,
-                  specifiedType: const FullType(OuterEnumIntegerDefaultValue))
+                        specifiedType: const FullType(OuterEnumIntegerDefaultValue)) as OuterEnumIntegerDefaultValue;
-              as OuterEnumIntegerDefaultValue;
                     break;
             }
         }
@@ -172,6 +167,7 @@ class _$EnumTestSerializer implements StructuredSerializer<EnumTest> {
 }
 
 class EnumTestEnumStringEnum extends EnumClass {
+
   @BuiltValueEnumConst(wireName: r'UPPER')
   static const EnumTestEnumStringEnum UPPER = _$enumTestEnumStringEnum_UPPER;
   @BuiltValueEnumConst(wireName: r'lower')
@@ -179,73 +175,58 @@ class EnumTestEnumStringEnum extends EnumClass {
   @BuiltValueEnumConst(wireName: r'')
   static const EnumTestEnumStringEnum empty = _$enumTestEnumStringEnum_empty;
 
-  static Serializer<EnumTestEnumStringEnum> get serializer =>
+  static Serializer<EnumTestEnumStringEnum> get serializer => _$enumTestEnumStringEnumSerializer;
-      _$enumTestEnumStringEnumSerializer;
 
   const EnumTestEnumStringEnum._(String name): super(name);
 
-  static BuiltSet<EnumTestEnumStringEnum> get values =>
+  static BuiltSet<EnumTestEnumStringEnum> get values => _$enumTestEnumStringEnumValues;
-      _$enumTestEnumStringEnumValues;
+  static EnumTestEnumStringEnum valueOf(String name) => _$enumTestEnumStringEnumValueOf(name);
-  static EnumTestEnumStringEnum valueOf(String name) =>
-      _$enumTestEnumStringEnumValueOf(name);
 }
 
 class EnumTestEnumStringRequiredEnum extends EnumClass {
-  @BuiltValueEnumConst(wireName: r'UPPER')
-  static const EnumTestEnumStringRequiredEnum UPPER =
-      _$enumTestEnumStringRequiredEnum_UPPER;
-  @BuiltValueEnumConst(wireName: r'lower')
-  static const EnumTestEnumStringRequiredEnum lower =
-      _$enumTestEnumStringRequiredEnum_lower;
-  @BuiltValueEnumConst(wireName: r'')
-  static const EnumTestEnumStringRequiredEnum empty =
-      _$enumTestEnumStringRequiredEnum_empty;
 
-  static Serializer<EnumTestEnumStringRequiredEnum> get serializer =>
+  @BuiltValueEnumConst(wireName: r'UPPER')
-      _$enumTestEnumStringRequiredEnumSerializer;
+  static const EnumTestEnumStringRequiredEnum UPPER = _$enumTestEnumStringRequiredEnum_UPPER;
+  @BuiltValueEnumConst(wireName: r'lower')
+  static const EnumTestEnumStringRequiredEnum lower = _$enumTestEnumStringRequiredEnum_lower;
+  @BuiltValueEnumConst(wireName: r'')
+  static const EnumTestEnumStringRequiredEnum empty = _$enumTestEnumStringRequiredEnum_empty;
+
+  static Serializer<EnumTestEnumStringRequiredEnum> get serializer => _$enumTestEnumStringRequiredEnumSerializer;
 
   const EnumTestEnumStringRequiredEnum._(String name): super(name);
 
-  static BuiltSet<EnumTestEnumStringRequiredEnum> get values =>
+  static BuiltSet<EnumTestEnumStringRequiredEnum> get values => _$enumTestEnumStringRequiredEnumValues;
-      _$enumTestEnumStringRequiredEnumValues;
+  static EnumTestEnumStringRequiredEnum valueOf(String name) => _$enumTestEnumStringRequiredEnumValueOf(name);
-  static EnumTestEnumStringRequiredEnum valueOf(String name) =>
-      _$enumTestEnumStringRequiredEnumValueOf(name);
 }
 
 class EnumTestEnumIntegerEnum extends EnumClass {
-  @BuiltValueEnumConst(wireNumber: 1)
-  static const EnumTestEnumIntegerEnum number1 =
-      _$enumTestEnumIntegerEnum_number1;
-  @BuiltValueEnumConst(wireNumber: -1)
-  static const EnumTestEnumIntegerEnum numberNegative1 =
-      _$enumTestEnumIntegerEnum_numberNegative1;
 
-  static Serializer<EnumTestEnumIntegerEnum> get serializer =>
+  @BuiltValueEnumConst(wireNumber: 1)
-      _$enumTestEnumIntegerEnumSerializer;
+  static const EnumTestEnumIntegerEnum number1 = _$enumTestEnumIntegerEnum_number1;
+  @BuiltValueEnumConst(wireNumber: -1)
+  static const EnumTestEnumIntegerEnum numberNegative1 = _$enumTestEnumIntegerEnum_numberNegative1;
+
+  static Serializer<EnumTestEnumIntegerEnum> get serializer => _$enumTestEnumIntegerEnumSerializer;
 
   const EnumTestEnumIntegerEnum._(String name): super(name);
 
-  static BuiltSet<EnumTestEnumIntegerEnum> get values =>
+  static BuiltSet<EnumTestEnumIntegerEnum> get values => _$enumTestEnumIntegerEnumValues;
-      _$enumTestEnumIntegerEnumValues;
+  static EnumTestEnumIntegerEnum valueOf(String name) => _$enumTestEnumIntegerEnumValueOf(name);
-  static EnumTestEnumIntegerEnum valueOf(String name) =>
-      _$enumTestEnumIntegerEnumValueOf(name);
 }
 
 class EnumTestEnumNumberEnum extends EnumClass {
-  @BuiltValueEnumConst(wireName: r'1.1')
-  static const EnumTestEnumNumberEnum number1Period1 =
-      _$enumTestEnumNumberEnum_number1Period1;
-  @BuiltValueEnumConst(wireName: r'-1.2')
-  static const EnumTestEnumNumberEnum numberNegative1Period2 =
-      _$enumTestEnumNumberEnum_numberNegative1Period2;
 
-  static Serializer<EnumTestEnumNumberEnum> get serializer =>
+  @BuiltValueEnumConst(wireName: r'1.1')
-      _$enumTestEnumNumberEnumSerializer;
+  static const EnumTestEnumNumberEnum number1Period1 = _$enumTestEnumNumberEnum_number1Period1;
+  @BuiltValueEnumConst(wireName: r'-1.2')
+  static const EnumTestEnumNumberEnum numberNegative1Period2 = _$enumTestEnumNumberEnum_numberNegative1Period2;
+
+  static Serializer<EnumTestEnumNumberEnum> get serializer => _$enumTestEnumNumberEnumSerializer;
 
   const EnumTestEnumNumberEnum._(String name): super(name);
 
-  static BuiltSet<EnumTestEnumNumberEnum> get values =>
+  static BuiltSet<EnumTestEnumNumberEnum> get values => _$enumTestEnumNumberEnumValues;
-      _$enumTestEnumNumberEnumValues;
+  static EnumTestEnumNumberEnum valueOf(String name) => _$enumTestEnumNumberEnumValueOf(name);
-  static EnumTestEnumNumberEnum valueOf(String name) =>
-      _$enumTestEnumNumberEnumValueOf(name);
 }
+

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

@@ -9,8 +9,9 @@ import 'package:built_value/serializer.dart';
 
 part 'file_schema_test_class.g.dart';
 
-abstract class FileSchemaTestClass
+
-    implements Built<FileSchemaTestClass, FileSchemaTestClassBuilder> {
+
+abstract class FileSchemaTestClass implements Built<FileSchemaTestClass, FileSchemaTestClassBuilder> {
     @BuiltValueField(wireName: r'file')
     ModelFile? get file;
 
@@ -21,28 +22,21 @@ abstract class FileSchemaTestClass
 
     static void _initializeBuilder(FileSchemaTestClassBuilder b) => b;
 
-  factory FileSchemaTestClass([void updates(FileSchemaTestClassBuilder b)]) =
+    factory FileSchemaTestClass([void updates(FileSchemaTestClassBuilder b)]) = _$FileSchemaTestClass;
-      _$FileSchemaTestClass;
 
     @BuiltValueSerializer(custom: true)
-  static Serializer<FileSchemaTestClass> get serializer =>
+    static Serializer<FileSchemaTestClass> get serializer => _$FileSchemaTestClassSerializer();
-      _$FileSchemaTestClassSerializer();
 }
 
-class _$FileSchemaTestClassSerializer
+class _$FileSchemaTestClassSerializer implements StructuredSerializer<FileSchemaTestClass> {
-    implements StructuredSerializer<FileSchemaTestClass> {
     @override
-  final Iterable<Type> types = const [
+    final Iterable<Type> types = const [FileSchemaTestClass, _$FileSchemaTestClass];
-    FileSchemaTestClass,
-    _$FileSchemaTestClass
-  ];
 
     @override
     final String wireName = r'FileSchemaTestClass';
 
     @override
-  Iterable<Object?> serialize(
+    Iterable<Object?> serialize(Serializers serializers, FileSchemaTestClass object,
-      Serializers serializers, FileSchemaTestClass object,
         {FullType specifiedType = FullType.unspecified}) {
         final result = <Object?>[];
         if (object.file != null) {
@@ -61,8 +55,7 @@ class _$FileSchemaTestClassSerializer
     }
 
     @override
-  FileSchemaTestClass deserialize(
+    FileSchemaTestClass deserialize(Serializers serializers, Iterable<Object?> serialized,
-      Serializers serializers, Iterable<Object?> serialized,
         {FullType specifiedType = FullType.unspecified}) {
         final result = FileSchemaTestClassBuilder();
 
@@ -78,12 +71,11 @@ class _$FileSchemaTestClassSerializer
                     break;
                 case r'files':
                     result.files.replace(serializers.deserialize(value,
-                  specifiedType:
+                        specifiedType: const FullType(BuiltList, [FullType(ModelFile)])) as BuiltList<ModelFile>);
-                      const FullType(BuiltList, [FullType(ModelFile)]))
-              as BuiltList<ModelFile>);
                     break;
             }
         }
         return result.build();
     }
 }
+

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

@@ -7,13 +7,16 @@ import 'package:built_value/serializer.dart';
 
 part 'foo.g.dart';
 
+
+
 abstract class Foo implements Built<Foo, FooBuilder> {
     @BuiltValueField(wireName: r'bar')
     String? get bar;
 
     Foo._();
 
-  static void _initializeBuilder(FooBuilder b) => b..bar = 'bar';
+    static void _initializeBuilder(FooBuilder b) => b
+        ..bar = 'bar';
 
     factory Foo([void updates(FooBuilder b)]) = _$Foo;
 
@@ -61,3 +64,4 @@ class _$FooSerializer implements StructuredSerializer<Foo> {
         return result.build();
     }
 }
+

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

@@ -8,6 +8,8 @@ import 'package:built_value/serializer.dart';
 
 part 'format_test.g.dart';
 
+
+
 abstract class FormatTest implements Built<FormatTest, FormatTestBuilder> {
     @BuiltValueField(wireName: r'integer')
     int? get integer;
@@ -251,3 +253,4 @@ class _$FormatTestSerializer implements StructuredSerializer<FormatTest> {
         return result.build();
     }
 }
+

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

@@ -7,8 +7,9 @@ import 'package:built_value/serializer.dart';
 
 part 'has_only_read_only.g.dart';
 
-abstract class HasOnlyReadOnly
+
-    implements Built<HasOnlyReadOnly, HasOnlyReadOnlyBuilder> {
+
+abstract class HasOnlyReadOnly implements Built<HasOnlyReadOnly, HasOnlyReadOnlyBuilder> {
     @BuiltValueField(wireName: r'bar')
     String? get bar;
 
@@ -19,16 +20,13 @@ abstract class HasOnlyReadOnly
 
     static void _initializeBuilder(HasOnlyReadOnlyBuilder b) => b;
 
-  factory HasOnlyReadOnly([void updates(HasOnlyReadOnlyBuilder b)]) =
+    factory HasOnlyReadOnly([void updates(HasOnlyReadOnlyBuilder b)]) = _$HasOnlyReadOnly;
-      _$HasOnlyReadOnly;
 
     @BuiltValueSerializer(custom: true)
-  static Serializer<HasOnlyReadOnly> get serializer =>
+    static Serializer<HasOnlyReadOnly> get serializer => _$HasOnlyReadOnlySerializer();
-      _$HasOnlyReadOnlySerializer();
 }
 
-class _$HasOnlyReadOnlySerializer
+class _$HasOnlyReadOnlySerializer implements StructuredSerializer<HasOnlyReadOnly> {
-    implements StructuredSerializer<HasOnlyReadOnly> {
     @override
     final Iterable<Type> types = const [HasOnlyReadOnly, _$HasOnlyReadOnly];
 
@@ -55,8 +53,7 @@ class _$HasOnlyReadOnlySerializer
     }
 
     @override
-  HasOnlyReadOnly deserialize(
+    HasOnlyReadOnly deserialize(Serializers serializers, Iterable<Object?> serialized,
-      Serializers serializers, Iterable<Object?> serialized,
         {FullType specifiedType = FullType.unspecified}) {
         final result = HasOnlyReadOnlyBuilder();
 
@@ -79,3 +76,4 @@ class _$HasOnlyReadOnlySerializer
         return result.build();
     }
 }
+

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

@@ -7,8 +7,9 @@ import 'package:built_value/serializer.dart';
 
 part 'health_check_result.g.dart';
 
-abstract class HealthCheckResult
+
-    implements Built<HealthCheckResult, HealthCheckResultBuilder> {
+
+abstract class HealthCheckResult implements Built<HealthCheckResult, HealthCheckResultBuilder> {
     @BuiltValueField(wireName: r'NullableMessage')
     String? get nullableMessage;
 
@@ -16,16 +17,13 @@ abstract class HealthCheckResult
 
     static void _initializeBuilder(HealthCheckResultBuilder b) => b;
 
-  factory HealthCheckResult([void updates(HealthCheckResultBuilder b)]) =
+    factory HealthCheckResult([void updates(HealthCheckResultBuilder b)]) = _$HealthCheckResult;
-      _$HealthCheckResult;
 
     @BuiltValueSerializer(custom: true)
-  static Serializer<HealthCheckResult> get serializer =>
+    static Serializer<HealthCheckResult> get serializer => _$HealthCheckResultSerializer();
-      _$HealthCheckResultSerializer();
 }
 
-class _$HealthCheckResultSerializer
+class _$HealthCheckResultSerializer implements StructuredSerializer<HealthCheckResult> {
-    implements StructuredSerializer<HealthCheckResult> {
     @override
     final Iterable<Type> types = const [HealthCheckResult, _$HealthCheckResult];
 
@@ -46,8 +44,7 @@ class _$HealthCheckResultSerializer
     }
 
     @override
-  HealthCheckResult deserialize(
+    HealthCheckResult deserialize(Serializers serializers, Iterable<Object?> serialized,
-      Serializers serializers, Iterable<Object?> serialized,
         {FullType specifiedType = FullType.unspecified}) {
         final result = HealthCheckResultBuilder();
 
@@ -66,3 +63,4 @@ class _$HealthCheckResultSerializer
         return result.build();
     }
 }
+

samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/lib/src/model/inline_response_default.dart

@@ -8,8 +8,9 @@ import 'package:built_value/serializer.dart';
 
 part 'inline_response_default.g.dart';
 
-abstract class InlineResponseDefault
+
-    implements Built<InlineResponseDefault, InlineResponseDefaultBuilder> {
+
+abstract class InlineResponseDefault implements Built<InlineResponseDefault, InlineResponseDefaultBuilder> {
     @BuiltValueField(wireName: r'string')
     Foo? get string;
 
@@ -17,28 +18,21 @@ abstract class InlineResponseDefault
 
     static void _initializeBuilder(InlineResponseDefaultBuilder b) => b;
 
-  factory InlineResponseDefault(
+    factory InlineResponseDefault([void updates(InlineResponseDefaultBuilder b)]) = _$InlineResponseDefault;
-      [void updates(InlineResponseDefaultBuilder b)]) = _$InlineResponseDefault;
 
     @BuiltValueSerializer(custom: true)
-  static Serializer<InlineResponseDefault> get serializer =>
+    static Serializer<InlineResponseDefault> get serializer => _$InlineResponseDefaultSerializer();
-      _$InlineResponseDefaultSerializer();
 }
 
-class _$InlineResponseDefaultSerializer
+class _$InlineResponseDefaultSerializer implements StructuredSerializer<InlineResponseDefault> {
-    implements StructuredSerializer<InlineResponseDefault> {
     @override
-  final Iterable<Type> types = const [
+    final Iterable<Type> types = const [InlineResponseDefault, _$InlineResponseDefault];
-    InlineResponseDefault,
-    _$InlineResponseDefault
-  ];
 
     @override
     final String wireName = r'InlineResponseDefault';
 
     @override
-  Iterable<Object?> serialize(
+    Iterable<Object?> serialize(Serializers serializers, InlineResponseDefault object,
-      Serializers serializers, InlineResponseDefault object,
         {FullType specifiedType = FullType.unspecified}) {
         final result = <Object?>[];
         if (object.string != null) {
@@ -51,8 +45,7 @@ class _$InlineResponseDefaultSerializer
     }
 
     @override
-  InlineResponseDefault deserialize(
+    InlineResponseDefault deserialize(Serializers serializers, Iterable<Object?> serialized,
-      Serializers serializers, Iterable<Object?> serialized,
         {FullType specifiedType = FullType.unspecified}) {
         final result = InlineResponseDefaultBuilder();
 
@@ -71,3 +64,4 @@ class _$InlineResponseDefaultSerializer
         return result.build();
     }
 }
+

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

@@ -8,6 +8,8 @@ import 'package:built_value/serializer.dart';
 
 part 'map_test.g.dart';
 
+
+
 abstract class MapTest implements Built<MapTest, MapTestBuilder> {
     @BuiltValueField(wireName: r'map_map_of_string')
     BuiltMap<String, BuiltMap<String, String>>? get mapMapOfString;
@@ -47,31 +49,25 @@ class _$MapTestSerializer implements StructuredSerializer<MapTest> {
             result
                 ..add(r'map_map_of_string')
                 ..add(serializers.serialize(object.mapMapOfString,
-            specifiedType: const FullType(BuiltMap, [
+                    specifiedType: const FullType(BuiltMap, [FullType(String), FullType(BuiltMap, [FullType(String), FullType(String)])])));
-              FullType(String),
-              FullType(BuiltMap, [FullType(String), FullType(String)])
-            ])));
         }
         if (object.mapOfEnumString != null) {
             result
                 ..add(r'map_of_enum_string')
                 ..add(serializers.serialize(object.mapOfEnumString,
-            specifiedType: const FullType(BuiltMap,
+                    specifiedType: const FullType(BuiltMap, [FullType(String), FullType(MapTestMapOfEnumStringEnum)])));
-                [FullType(String), FullType(MapTestMapOfEnumStringEnum)])));
         }
         if (object.directMap != null) {
             result
                 ..add(r'direct_map')
                 ..add(serializers.serialize(object.directMap,
-            specifiedType:
+                    specifiedType: const FullType(BuiltMap, [FullType(String), FullType(bool)])));
-                const FullType(BuiltMap, [FullType(String), FullType(bool)])));
         }
         if (object.indirectMap != null) {
             result
                 ..add(r'indirect_map')
                 ..add(serializers.serialize(object.indirectMap,
-            specifiedType:
+                    specifiedType: const FullType(BuiltMap, [FullType(String), FullType(bool)])));
-                const FullType(BuiltMap, [FullType(String), FullType(bool)])));
         }
         return result;
     }
@@ -89,29 +85,19 @@ class _$MapTestSerializer implements StructuredSerializer<MapTest> {
             switch (key) {
                 case r'map_map_of_string':
                     result.mapMapOfString.replace(serializers.deserialize(value,
-              specifiedType: const FullType(BuiltMap, [
+                        specifiedType: const FullType(BuiltMap, [FullType(String), FullType(BuiltMap, [FullType(String), FullType(String)])])) as BuiltMap<String, BuiltMap<String, String>>);
-                FullType(String),
-                FullType(BuiltMap, [FullType(String), FullType(String)])
-              ])) as BuiltMap<String, BuiltMap<String, String>>);
                     break;
                 case r'map_of_enum_string':
                     result.mapOfEnumString.replace(serializers.deserialize(value,
-              specifiedType: const FullType(BuiltMap, [
+                        specifiedType: const FullType(BuiltMap, [FullType(String), FullType(MapTestMapOfEnumStringEnum)])) as BuiltMap<String, MapTestMapOfEnumStringEnum>);
-                FullType(String),
-                FullType(MapTestMapOfEnumStringEnum)
-              ])) as BuiltMap<String, MapTestMapOfEnumStringEnum>);
                     break;
                 case r'direct_map':
                     result.directMap.replace(serializers.deserialize(value,
-                  specifiedType: const FullType(
+                        specifiedType: const FullType(BuiltMap, [FullType(String), FullType(bool)])) as BuiltMap<String, bool>);
-                      BuiltMap, [FullType(String), FullType(bool)]))
-              as BuiltMap<String, bool>);
                     break;
                 case r'indirect_map':
                     result.indirectMap.replace(serializers.deserialize(value,
-                  specifiedType: const FullType(
+                        specifiedType: const FullType(BuiltMap, [FullType(String), FullType(bool)])) as BuiltMap<String, bool>);
-                      BuiltMap, [FullType(String), FullType(bool)]))
-              as BuiltMap<String, bool>);
                     break;
             }
         }
@@ -120,20 +106,17 @@ class _$MapTestSerializer implements StructuredSerializer<MapTest> {
 }
 
 class MapTestMapOfEnumStringEnum extends EnumClass {
-  @BuiltValueEnumConst(wireName: r'UPPER')
-  static const MapTestMapOfEnumStringEnum UPPER =
-      _$mapTestMapOfEnumStringEnum_UPPER;
-  @BuiltValueEnumConst(wireName: r'lower')
-  static const MapTestMapOfEnumStringEnum lower =
-      _$mapTestMapOfEnumStringEnum_lower;
 
-  static Serializer<MapTestMapOfEnumStringEnum> get serializer =>
+  @BuiltValueEnumConst(wireName: r'UPPER')
-      _$mapTestMapOfEnumStringEnumSerializer;
+  static const MapTestMapOfEnumStringEnum UPPER = _$mapTestMapOfEnumStringEnum_UPPER;
+  @BuiltValueEnumConst(wireName: r'lower')
+  static const MapTestMapOfEnumStringEnum lower = _$mapTestMapOfEnumStringEnum_lower;
+
+  static Serializer<MapTestMapOfEnumStringEnum> get serializer => _$mapTestMapOfEnumStringEnumSerializer;
 
   const MapTestMapOfEnumStringEnum._(String name): super(name);
 
-  static BuiltSet<MapTestMapOfEnumStringEnum> get values =>
+  static BuiltSet<MapTestMapOfEnumStringEnum> get values => _$mapTestMapOfEnumStringEnumValues;
-      _$mapTestMapOfEnumStringEnumValues;
+  static MapTestMapOfEnumStringEnum valueOf(String name) => _$mapTestMapOfEnumStringEnumValueOf(name);
-  static MapTestMapOfEnumStringEnum valueOf(String name) =>
-      _$mapTestMapOfEnumStringEnumValueOf(name);
 }
+

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

@@ -9,10 +9,9 @@ import 'package:built_value/serializer.dart';
 
 part 'mixed_properties_and_additional_properties_class.g.dart';
 
-abstract class MixedPropertiesAndAdditionalPropertiesClass
+
-    implements
+
-        Built<MixedPropertiesAndAdditionalPropertiesClass,
+abstract class MixedPropertiesAndAdditionalPropertiesClass implements Built<MixedPropertiesAndAdditionalPropertiesClass, MixedPropertiesAndAdditionalPropertiesClassBuilder> {
-            MixedPropertiesAndAdditionalPropertiesClassBuilder> {
     @BuiltValueField(wireName: r'uuid')
     String? get uuid;
 
@@ -24,36 +23,23 @@ abstract class MixedPropertiesAndAdditionalPropertiesClass
 
     MixedPropertiesAndAdditionalPropertiesClass._();
 
-  static void _initializeBuilder(
+    static void _initializeBuilder(MixedPropertiesAndAdditionalPropertiesClassBuilder b) => b;
-          MixedPropertiesAndAdditionalPropertiesClassBuilder b) =>
-      b;
 
-  factory MixedPropertiesAndAdditionalPropertiesClass(
+    factory MixedPropertiesAndAdditionalPropertiesClass([void updates(MixedPropertiesAndAdditionalPropertiesClassBuilder b)]) = _$MixedPropertiesAndAdditionalPropertiesClass;
-          [void updates(
-              MixedPropertiesAndAdditionalPropertiesClassBuilder b)]) =
-      _$MixedPropertiesAndAdditionalPropertiesClass;
 
     @BuiltValueSerializer(custom: true)
-  static Serializer<MixedPropertiesAndAdditionalPropertiesClass>
+    static Serializer<MixedPropertiesAndAdditionalPropertiesClass> get serializer => _$MixedPropertiesAndAdditionalPropertiesClassSerializer();
-      get serializer =>
-          _$MixedPropertiesAndAdditionalPropertiesClassSerializer();
 }
 
-class _$MixedPropertiesAndAdditionalPropertiesClassSerializer
+class _$MixedPropertiesAndAdditionalPropertiesClassSerializer implements StructuredSerializer<MixedPropertiesAndAdditionalPropertiesClass> {
-    implements
-        StructuredSerializer<MixedPropertiesAndAdditionalPropertiesClass> {
     @override
-  final Iterable<Type> types = const [
+    final Iterable<Type> types = const [MixedPropertiesAndAdditionalPropertiesClass, _$MixedPropertiesAndAdditionalPropertiesClass];
-    MixedPropertiesAndAdditionalPropertiesClass,
-    _$MixedPropertiesAndAdditionalPropertiesClass
-  ];
 
     @override
     final String wireName = r'MixedPropertiesAndAdditionalPropertiesClass';
 
     @override
-  Iterable<Object?> serialize(Serializers serializers,
+    Iterable<Object?> serialize(Serializers serializers, MixedPropertiesAndAdditionalPropertiesClass object,
-      MixedPropertiesAndAdditionalPropertiesClass object,
         {FullType specifiedType = FullType.unspecified}) {
         final result = <Object?>[];
         if (object.uuid != null) {
@@ -72,15 +58,13 @@ class _$MixedPropertiesAndAdditionalPropertiesClassSerializer
             result
                 ..add(r'map')
                 ..add(serializers.serialize(object.map,
-            specifiedType: const FullType(
+                    specifiedType: const FullType(BuiltMap, [FullType(String), FullType(Animal)])));
-                BuiltMap, [FullType(String), FullType(Animal)])));
         }
         return result;
     }
 
     @override
-  MixedPropertiesAndAdditionalPropertiesClass deserialize(
+    MixedPropertiesAndAdditionalPropertiesClass deserialize(Serializers serializers, Iterable<Object?> serialized,
-      Serializers serializers, Iterable<Object?> serialized,
         {FullType specifiedType = FullType.unspecified}) {
         final result = MixedPropertiesAndAdditionalPropertiesClassBuilder();
 
@@ -100,12 +84,11 @@ class _$MixedPropertiesAndAdditionalPropertiesClassSerializer
                     break;
                 case r'map':
                     result.map.replace(serializers.deserialize(value,
-                  specifiedType: const FullType(
+                        specifiedType: const FullType(BuiltMap, [FullType(String), FullType(Animal)])) as BuiltMap<String, Animal>);
-                      BuiltMap, [FullType(String), FullType(Animal)]))
-              as BuiltMap<String, Animal>);
                     break;
             }
         }
         return result.build();
     }
 }
+

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

@@ -7,8 +7,9 @@ import 'package:built_value/serializer.dart';
 
 part 'model200_response.g.dart';
 
-abstract class Model200Response
+
-    implements Built<Model200Response, Model200ResponseBuilder> {
+
+abstract class Model200Response implements Built<Model200Response, Model200ResponseBuilder> {
     @BuiltValueField(wireName: r'name')
     int? get name;
 
@@ -19,16 +20,13 @@ abstract class Model200Response
 
     static void _initializeBuilder(Model200ResponseBuilder b) => b;
 
-  factory Model200Response([void updates(Model200ResponseBuilder b)]) =
+    factory Model200Response([void updates(Model200ResponseBuilder b)]) = _$Model200Response;
-      _$Model200Response;
 
     @BuiltValueSerializer(custom: true)
-  static Serializer<Model200Response> get serializer =>
+    static Serializer<Model200Response> get serializer => _$Model200ResponseSerializer();
-      _$Model200ResponseSerializer();
 }
 
-class _$Model200ResponseSerializer
+class _$Model200ResponseSerializer implements StructuredSerializer<Model200Response> {
-    implements StructuredSerializer<Model200Response> {
     @override
     final Iterable<Type> types = const [Model200Response, _$Model200Response];
 
@@ -55,8 +53,7 @@ class _$Model200ResponseSerializer
     }
 
     @override
-  Model200Response deserialize(
+    Model200Response deserialize(Serializers serializers, Iterable<Object?> serialized,
-      Serializers serializers, Iterable<Object?> serialized,
         {FullType specifiedType = FullType.unspecified}) {
         final result = Model200ResponseBuilder();
 
@@ -79,3 +76,4 @@ class _$Model200ResponseSerializer
         return result.build();
     }
 }
+

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

@@ -7,6 +7,8 @@ import 'package:built_value/serializer.dart';
 
 part 'model_client.g.dart';
 
+
+
 abstract class ModelClient implements Built<ModelClient, ModelClientBuilder> {
     @BuiltValueField(wireName: r'client')
     String? get client;
@@ -61,3 +63,4 @@ class _$ModelClientSerializer implements StructuredSerializer<ModelClient> {
         return result.build();
     }
 }
+

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

@@ -9,16 +9,15 @@ import 'package:built_value/serializer.dart';
 part 'model_enum_class.g.dart';
 
 class ModelEnumClass extends EnumClass {
+
   @BuiltValueEnumConst(wireName: r'_abc')
   static const ModelEnumClass abc = _$abc;
   @BuiltValueEnumConst(wireName: r'-efg')
   static const ModelEnumClass efg = _$efg;
   @BuiltValueEnumConst(wireName: r'(xyz)')
-  static const ModelEnumClass leftParenthesisXyzRightParenthesis =
+  static const ModelEnumClass leftParenthesisXyzRightParenthesis = _$leftParenthesisXyzRightParenthesis;
-      _$leftParenthesisXyzRightParenthesis;
 
-  static Serializer<ModelEnumClass> get serializer =>
+  static Serializer<ModelEnumClass> get serializer => _$modelEnumClassSerializer;
-      _$modelEnumClassSerializer;
 
   const ModelEnumClass._(String name): super(name);
 
@@ -33,3 +32,4 @@ class ModelEnumClass extends EnumClass {
 ///
 /// Trigger mixin generation by writing a line like this one next to your enum.
 abstract class ModelEnumClassMixin = Object with _$ModelEnumClassMixin;
+

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

@@ -7,6 +7,8 @@ import 'package:built_value/serializer.dart';
 
 part 'model_file.g.dart';
 
+
+
 abstract class ModelFile implements Built<ModelFile, ModelFileBuilder> {
     /// Test capitalization
     @BuiltValueField(wireName: r'sourceURI')
@@ -62,3 +64,4 @@ class _$ModelFileSerializer implements StructuredSerializer<ModelFile> {
         return result.build();
     }
 }
+

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

@@ -7,6 +7,8 @@ import 'package:built_value/serializer.dart';
 
 part 'model_list.g.dart';
 
+
+
 abstract class ModelList implements Built<ModelList, ModelListBuilder> {
     @BuiltValueField(wireName: r'123-list')
     String? get n123list;
@@ -61,3 +63,4 @@ class _$ModelListSerializer implements StructuredSerializer<ModelList> {
         return result.build();
     }
 }
+

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

@@ -7,6 +7,8 @@ import 'package:built_value/serializer.dart';
 
 part 'model_return.g.dart';
 
+
+
 abstract class ModelReturn implements Built<ModelReturn, ModelReturnBuilder> {
     @BuiltValueField(wireName: r'return')
     int? get return_;
@@ -61,3 +63,4 @@ class _$ModelReturnSerializer implements StructuredSerializer<ModelReturn> {
         return result.build();
     }
 }
+

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

@@ -7,6 +7,8 @@ import 'package:built_value/serializer.dart';
 
 part 'name.g.dart';
 
+
+
 abstract class Name implements Built<Name, NameBuilder> {
     @BuiltValueField(wireName: r'name')
     int get name;
@@ -98,3 +100,4 @@ class _$NameSerializer implements StructuredSerializer<Name> {
         return result.build();
     }
 }
+

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

@@ -9,8 +9,9 @@ import 'package:built_value/serializer.dart';
 
 part 'nullable_class.g.dart';
 
-abstract class NullableClass
+
-    implements Built<NullableClass, NullableClassBuilder> {
+
+abstract class NullableClass implements Built<NullableClass, NullableClassBuilder> {
     @BuiltValueField(wireName: r'integer_prop')
     int? get integerProp;
 
@@ -51,12 +52,10 @@ abstract class NullableClass
 
     static void _initializeBuilder(NullableClassBuilder b) => b;
 
-  factory NullableClass([void updates(NullableClassBuilder b)]) =
+    factory NullableClass([void updates(NullableClassBuilder b)]) = _$NullableClass;
-      _$NullableClass;
 
     @BuiltValueSerializer(custom: true)
-  static Serializer<NullableClass> get serializer =>
+    static Serializer<NullableClass> get serializer => _$NullableClassSerializer();
-      _$NullableClassSerializer();
 }
 
 class _$NullableClassSerializer implements StructuredSerializer<NullableClass> {
@@ -128,29 +127,25 @@ class _$NullableClassSerializer implements StructuredSerializer<NullableClass> {
             result
                 ..add(r'object_nullable_prop')
                 ..add(serializers.serialize(object.objectNullableProp,
-            specifiedType: const FullType(
+                    specifiedType: const FullType(BuiltMap, [FullType(String), FullType(JsonObject)])));
-                BuiltMap, [FullType(String), FullType(JsonObject)])));
         }
         if (object.objectAndItemsNullableProp != null) {
             result
                 ..add(r'object_and_items_nullable_prop')
                 ..add(serializers.serialize(object.objectAndItemsNullableProp,
-            specifiedType: const FullType(
+                    specifiedType: const FullType(BuiltMap, [FullType(String), FullType(JsonObject)])));
-                BuiltMap, [FullType(String), FullType(JsonObject)])));
         }
         if (object.objectItemsNullable != null) {
             result
                 ..add(r'object_items_nullable')
                 ..add(serializers.serialize(object.objectItemsNullable,
-            specifiedType: const FullType(
+                    specifiedType: const FullType(BuiltMap, [FullType(String), FullType(JsonObject)])));
-                BuiltMap, [FullType(String), FullType(JsonObject)])));
         }
         return result;
     }
 
     @override
-  NullableClass deserialize(
+    NullableClass deserialize(Serializers serializers, Iterable<Object?> serialized,
-      Serializers serializers, Iterable<Object?> serialized,
         {FullType specifiedType = FullType.unspecified}) {
         final result = NullableClassBuilder();
 
@@ -186,44 +181,31 @@ class _$NullableClassSerializer implements StructuredSerializer<NullableClass> {
                     break;
                 case r'array_nullable_prop':
                     result.arrayNullableProp.replace(serializers.deserialize(value,
-                  specifiedType:
+                        specifiedType: const FullType(BuiltList, [FullType(JsonObject)])) as BuiltList<JsonObject>);
-                      const FullType(BuiltList, [FullType(JsonObject)]))
-              as BuiltList<JsonObject>);
                     break;
                 case r'array_and_items_nullable_prop':
-          result.arrayAndItemsNullableProp.replace(serializers.deserialize(
+                    result.arrayAndItemsNullableProp.replace(serializers.deserialize(value,
-                  value,
+                        specifiedType: const FullType(BuiltList, [FullType(JsonObject)])) as BuiltList<JsonObject>);
-                  specifiedType:
-                      const FullType(BuiltList, [FullType(JsonObject)]))
-              as BuiltList<JsonObject>);
                     break;
                 case r'array_items_nullable':
                     result.arrayItemsNullable.replace(serializers.deserialize(value,
-                  specifiedType:
+                        specifiedType: const FullType(BuiltList, [FullType(JsonObject)])) as BuiltList<JsonObject>);
-                      const FullType(BuiltList, [FullType(JsonObject)]))
-              as BuiltList<JsonObject>);
                     break;
                 case r'object_nullable_prop':
                     result.objectNullableProp.replace(serializers.deserialize(value,
-                  specifiedType: const FullType(
+                        specifiedType: const FullType(BuiltMap, [FullType(String), FullType(JsonObject)])) as BuiltMap<String, JsonObject>);
-                      BuiltMap, [FullType(String), FullType(JsonObject)]))
-              as BuiltMap<String, JsonObject>);
                     break;
                 case r'object_and_items_nullable_prop':
-          result.objectAndItemsNullableProp.replace(serializers.deserialize(
+                    result.objectAndItemsNullableProp.replace(serializers.deserialize(value,
-                  value,
+                        specifiedType: const FullType(BuiltMap, [FullType(String), FullType(JsonObject)])) as BuiltMap<String, JsonObject>);
-                  specifiedType: const FullType(
-                      BuiltMap, [FullType(String), FullType(JsonObject)]))
-              as BuiltMap<String, JsonObject>);
                     break;
                 case r'object_items_nullable':
                     result.objectItemsNullable.replace(serializers.deserialize(value,
-                  specifiedType: const FullType(
+                        specifiedType: const FullType(BuiltMap, [FullType(String), FullType(JsonObject)])) as BuiltMap<String, JsonObject>);
-                      BuiltMap, [FullType(String), FullType(JsonObject)]))
-              as BuiltMap<String, JsonObject>);
                     break;
             }
         }
         return result.build();
     }
 }
+

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

@@ -7,6 +7,8 @@ import 'package:built_value/serializer.dart';
 
 part 'number_only.g.dart';
 
+
+
 abstract class NumberOnly implements Built<NumberOnly, NumberOnlyBuilder> {
     @BuiltValueField(wireName: r'JustNumber')
     num? get justNumber;
@@ -61,3 +63,4 @@ class _$NumberOnlySerializer implements StructuredSerializer<NumberOnly> {
         return result.build();
     }
 }
+

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

@@ -8,6 +8,8 @@ import 'package:built_value/serializer.dart';
 
 part 'order.g.dart';
 
+
+
 abstract class Order implements Built<Order, OrderBuilder> {
     @BuiltValueField(wireName: r'id')
     int? get id;
@@ -31,7 +33,8 @@ abstract class Order implements Built<Order, OrderBuilder> {
 
     Order._();
 
-  static void _initializeBuilder(OrderBuilder b) => b..complete = false;
+    static void _initializeBuilder(OrderBuilder b) => b
+        ..complete = false;
 
     factory Order([void updates(OrderBuilder b)]) = _$Order;
 
@@ -118,8 +121,7 @@ class _$OrderSerializer implements StructuredSerializer<Order> {
                     break;
                 case r'status':
                     result.status = serializers.deserialize(value,
-                  specifiedType: const FullType(OrderStatusEnum))
+                        specifiedType: const FullType(OrderStatusEnum)) as OrderStatusEnum;
-              as OrderStatusEnum;
                     break;
                 case r'complete':
                     result.complete = serializers.deserialize(value,
@@ -132,23 +134,22 @@ class _$OrderSerializer implements StructuredSerializer<Order> {
 }
 
 class OrderStatusEnum extends EnumClass {
+
   /// Order Status
   @BuiltValueEnumConst(wireName: r'placed')
   static const OrderStatusEnum placed = _$orderStatusEnum_placed;
-
   /// Order Status
   @BuiltValueEnumConst(wireName: r'approved')
   static const OrderStatusEnum approved = _$orderStatusEnum_approved;
-
   /// Order Status
   @BuiltValueEnumConst(wireName: r'delivered')
   static const OrderStatusEnum delivered = _$orderStatusEnum_delivered;
 
-  static Serializer<OrderStatusEnum> get serializer =>
+  static Serializer<OrderStatusEnum> get serializer => _$orderStatusEnumSerializer;
-      _$orderStatusEnumSerializer;
 
   const OrderStatusEnum._(String name): super(name);
 
   static BuiltSet<OrderStatusEnum> get values => _$orderStatusEnumValues;
   static OrderStatusEnum valueOf(String name) => _$orderStatusEnumValueOf(name);
 }
+

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

@@ -7,8 +7,9 @@ import 'package:built_value/serializer.dart';
 
 part 'outer_composite.g.dart';
 
-abstract class OuterComposite
+
-    implements Built<OuterComposite, OuterCompositeBuilder> {
+
+abstract class OuterComposite implements Built<OuterComposite, OuterCompositeBuilder> {
     @BuiltValueField(wireName: r'my_number')
     num? get myNumber;
 
@@ -22,16 +23,13 @@ abstract class OuterComposite
 
     static void _initializeBuilder(OuterCompositeBuilder b) => b;
 
-  factory OuterComposite([void updates(OuterCompositeBuilder b)]) =
+    factory OuterComposite([void updates(OuterCompositeBuilder b)]) = _$OuterComposite;
-      _$OuterComposite;
 
     @BuiltValueSerializer(custom: true)
-  static Serializer<OuterComposite> get serializer =>
+    static Serializer<OuterComposite> get serializer => _$OuterCompositeSerializer();
-      _$OuterCompositeSerializer();
 }
 
-class _$OuterCompositeSerializer
+class _$OuterCompositeSerializer implements StructuredSerializer<OuterComposite> {
-    implements StructuredSerializer<OuterComposite> {
     @override
     final Iterable<Type> types = const [OuterComposite, _$OuterComposite];
 
@@ -64,8 +62,7 @@ class _$OuterCompositeSerializer
     }
 
     @override
-  OuterComposite deserialize(
+    OuterComposite deserialize(Serializers serializers, Iterable<Object?> serialized,
-      Serializers serializers, Iterable<Object?> serialized,
         {FullType specifiedType = FullType.unspecified}) {
         final result = OuterCompositeBuilder();
 
@@ -92,3 +89,4 @@ class _$OuterCompositeSerializer
         return result.build();
     }
 }
+

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

@@ -9,6 +9,7 @@ import 'package:built_value/serializer.dart';
 part 'outer_enum.g.dart';
 
 class OuterEnum extends EnumClass {
+
   @BuiltValueEnumConst(wireName: r'placed')
   static const OuterEnum placed = _$placed;
   @BuiltValueEnumConst(wireName: r'approved')
@@ -31,3 +32,4 @@ class OuterEnum extends EnumClass {
 ///
 /// Trigger mixin generation by writing a line like this one next to your enum.
 abstract class OuterEnumMixin = Object with _$OuterEnumMixin;
+

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

@@ -9,6 +9,7 @@ import 'package:built_value/serializer.dart';
 part 'outer_enum_default_value.g.dart';
 
 class OuterEnumDefaultValue extends EnumClass {
+
   @BuiltValueEnumConst(wireName: r'placed')
   static const OuterEnumDefaultValue placed = _$placed;
   @BuiltValueEnumConst(wireName: r'approved')
@@ -16,8 +17,7 @@ class OuterEnumDefaultValue extends EnumClass {
   @BuiltValueEnumConst(wireName: r'delivered')
   static const OuterEnumDefaultValue delivered = _$delivered;
 
-  static Serializer<OuterEnumDefaultValue> get serializer =>
+  static Serializer<OuterEnumDefaultValue> get serializer => _$outerEnumDefaultValueSerializer;
-      _$outerEnumDefaultValueSerializer;
 
   const OuterEnumDefaultValue._(String name): super(name);
 
@@ -31,5 +31,5 @@ class OuterEnumDefaultValue extends EnumClass {
 /// corresponding Angular template.
 ///
 /// Trigger mixin generation by writing a line like this one next to your enum.
-abstract class OuterEnumDefaultValueMixin = Object
+abstract class OuterEnumDefaultValueMixin = Object with _$OuterEnumDefaultValueMixin;
-    with _$OuterEnumDefaultValueMixin;
+

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

@@ -9,6 +9,7 @@ import 'package:built_value/serializer.dart';
 part 'outer_enum_integer.g.dart';
 
 class OuterEnumInteger extends EnumClass {
+
   @BuiltValueEnumConst(wireNumber: 0)
   static const OuterEnumInteger number0 = _$number0;
   @BuiltValueEnumConst(wireNumber: 1)
@@ -16,8 +17,7 @@ class OuterEnumInteger extends EnumClass {
   @BuiltValueEnumConst(wireNumber: 2)
   static const OuterEnumInteger number2 = _$number2;
 
-  static Serializer<OuterEnumInteger> get serializer =>
+  static Serializer<OuterEnumInteger> get serializer => _$outerEnumIntegerSerializer;
-      _$outerEnumIntegerSerializer;
 
   const OuterEnumInteger._(String name): super(name);
 
@@ -32,3 +32,4 @@ class OuterEnumInteger extends EnumClass {
 ///
 /// Trigger mixin generation by writing a line like this one next to your enum.
 abstract class OuterEnumIntegerMixin = Object with _$OuterEnumIntegerMixin;
+

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

@@ -9,6 +9,7 @@ import 'package:built_value/serializer.dart';
 part 'outer_enum_integer_default_value.g.dart';
 
 class OuterEnumIntegerDefaultValue extends EnumClass {
+
   @BuiltValueEnumConst(wireNumber: 0)
   static const OuterEnumIntegerDefaultValue number0 = _$number0;
   @BuiltValueEnumConst(wireNumber: 1)
@@ -16,8 +17,7 @@ class OuterEnumIntegerDefaultValue extends EnumClass {
   @BuiltValueEnumConst(wireNumber: 2)
   static const OuterEnumIntegerDefaultValue number2 = _$number2;
 
-  static Serializer<OuterEnumIntegerDefaultValue> get serializer =>
+  static Serializer<OuterEnumIntegerDefaultValue> get serializer => _$outerEnumIntegerDefaultValueSerializer;
-      _$outerEnumIntegerDefaultValueSerializer;
 
   const OuterEnumIntegerDefaultValue._(String name): super(name);
 
@@ -31,5 +31,5 @@ class OuterEnumIntegerDefaultValue extends EnumClass {
 /// corresponding Angular template.
 ///
 /// Trigger mixin generation by writing a line like this one next to your enum.
-abstract class OuterEnumIntegerDefaultValueMixin = Object
+abstract class OuterEnumIntegerDefaultValueMixin = Object with _$OuterEnumIntegerDefaultValueMixin;
-    with _$OuterEnumIntegerDefaultValueMixin;
+

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

@@ -8,9 +8,9 @@ import 'package:built_value/serializer.dart';
 
 part 'outer_object_with_enum_property.g.dart';
 
-abstract class OuterObjectWithEnumProperty
+
-    implements
+
-        Built<OuterObjectWithEnumProperty, OuterObjectWithEnumPropertyBuilder> {
+abstract class OuterObjectWithEnumProperty implements Built<OuterObjectWithEnumProperty, OuterObjectWithEnumPropertyBuilder> {
     @BuiltValueField(wireName: r'value')
     OuterEnumInteger get value;
     // enum valueEnum {  0,  1,  2,  };
@@ -19,29 +19,21 @@ abstract class OuterObjectWithEnumProperty
 
     static void _initializeBuilder(OuterObjectWithEnumPropertyBuilder b) => b;
 
-  factory OuterObjectWithEnumProperty(
+    factory OuterObjectWithEnumProperty([void updates(OuterObjectWithEnumPropertyBuilder b)]) = _$OuterObjectWithEnumProperty;
-          [void updates(OuterObjectWithEnumPropertyBuilder b)]) =
-      _$OuterObjectWithEnumProperty;
 
     @BuiltValueSerializer(custom: true)
-  static Serializer<OuterObjectWithEnumProperty> get serializer =>
+    static Serializer<OuterObjectWithEnumProperty> get serializer => _$OuterObjectWithEnumPropertySerializer();
-      _$OuterObjectWithEnumPropertySerializer();
 }
 
-class _$OuterObjectWithEnumPropertySerializer
+class _$OuterObjectWithEnumPropertySerializer implements StructuredSerializer<OuterObjectWithEnumProperty> {
-    implements StructuredSerializer<OuterObjectWithEnumProperty> {
     @override
-  final Iterable<Type> types = const [
+    final Iterable<Type> types = const [OuterObjectWithEnumProperty, _$OuterObjectWithEnumProperty];
-    OuterObjectWithEnumProperty,
-    _$OuterObjectWithEnumProperty
-  ];
 
     @override
     final String wireName = r'OuterObjectWithEnumProperty';
 
     @override
-  Iterable<Object?> serialize(
+    Iterable<Object?> serialize(Serializers serializers, OuterObjectWithEnumProperty object,
-      Serializers serializers, OuterObjectWithEnumProperty object,
         {FullType specifiedType = FullType.unspecified}) {
         final result = <Object?>[];
         result
@@ -52,8 +44,7 @@ class _$OuterObjectWithEnumPropertySerializer
     }
 
     @override
-  OuterObjectWithEnumProperty deserialize(
+    OuterObjectWithEnumProperty deserialize(Serializers serializers, Iterable<Object?> serialized,
-      Serializers serializers, Iterable<Object?> serialized,
         {FullType specifiedType = FullType.unspecified}) {
         final result = OuterObjectWithEnumPropertyBuilder();
 
@@ -65,11 +56,11 @@ class _$OuterObjectWithEnumPropertySerializer
             switch (key) {
                 case r'value':
                     result.value = serializers.deserialize(value,
-                  specifiedType: const FullType(OuterEnumInteger))
+                        specifiedType: const FullType(OuterEnumInteger)) as OuterEnumInteger;
-              as OuterEnumInteger;
                     break;
             }
         }
         return result.build();
     }
 }
+

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

@@ -10,6 +10,8 @@ import 'package:built_value/serializer.dart';
 
 part 'pet.g.dart';
 
+
+
 abstract class Pet implements Built<Pet, PetBuilder> {
     @BuiltValueField(wireName: r'id')
     int? get id;
@@ -112,13 +114,11 @@ class _$PetSerializer implements StructuredSerializer<Pet> {
                     break;
                 case r'photoUrls':
                     result.photoUrls.replace(serializers.deserialize(value,
-                  specifiedType: const FullType(BuiltSet, [FullType(String)]))
+                        specifiedType: const FullType(BuiltSet, [FullType(String)])) as BuiltSet<String>);
-              as BuiltSet<String>);
                     break;
                 case r'tags':
                     result.tags.replace(serializers.deserialize(value,
-                  specifiedType: const FullType(BuiltList, [FullType(Tag)]))
+                        specifiedType: const FullType(BuiltList, [FullType(Tag)])) as BuiltList<Tag>);
-              as BuiltList<Tag>);
                     break;
                 case r'status':
                     result.status = serializers.deserialize(value,
@@ -131,14 +131,13 @@ class _$PetSerializer implements StructuredSerializer<Pet> {
 }
 
 class PetStatusEnum extends EnumClass {
+
   /// pet status in the store
   @BuiltValueEnumConst(wireName: r'available')
   static const PetStatusEnum available = _$petStatusEnum_available;
-
   /// pet status in the store
   @BuiltValueEnumConst(wireName: r'pending')
   static const PetStatusEnum pending = _$petStatusEnum_pending;
-
   /// pet status in the store
   @BuiltValueEnumConst(wireName: r'sold')
   static const PetStatusEnum sold = _$petStatusEnum_sold;
@@ -150,3 +149,4 @@ class PetStatusEnum extends EnumClass {
   static BuiltSet<PetStatusEnum> get values => _$petStatusEnumValues;
   static PetStatusEnum valueOf(String name) => _$petStatusEnumValueOf(name);
 }
+

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

@@ -7,8 +7,9 @@ import 'package:built_value/serializer.dart';
 
 part 'read_only_first.g.dart';
 
-abstract class ReadOnlyFirst
+
-    implements Built<ReadOnlyFirst, ReadOnlyFirstBuilder> {
+
+abstract class ReadOnlyFirst implements Built<ReadOnlyFirst, ReadOnlyFirstBuilder> {
     @BuiltValueField(wireName: r'bar')
     String? get bar;
 
@@ -19,12 +20,10 @@ abstract class ReadOnlyFirst
 
     static void _initializeBuilder(ReadOnlyFirstBuilder b) => b;
 
-  factory ReadOnlyFirst([void updates(ReadOnlyFirstBuilder b)]) =
+    factory ReadOnlyFirst([void updates(ReadOnlyFirstBuilder b)]) = _$ReadOnlyFirst;
-      _$ReadOnlyFirst;
 
     @BuiltValueSerializer(custom: true)
-  static Serializer<ReadOnlyFirst> get serializer =>
+    static Serializer<ReadOnlyFirst> get serializer => _$ReadOnlyFirstSerializer();
-      _$ReadOnlyFirstSerializer();
 }
 
 class _$ReadOnlyFirstSerializer implements StructuredSerializer<ReadOnlyFirst> {
@@ -54,8 +53,7 @@ class _$ReadOnlyFirstSerializer implements StructuredSerializer<ReadOnlyFirst> {
     }
 
     @override
-  ReadOnlyFirst deserialize(
+    ReadOnlyFirst deserialize(Serializers serializers, Iterable<Object?> serialized,
-      Serializers serializers, Iterable<Object?> serialized,
         {FullType specifiedType = FullType.unspecified}) {
         final result = ReadOnlyFirstBuilder();
 
@@ -78,3 +76,4 @@ class _$ReadOnlyFirstSerializer implements StructuredSerializer<ReadOnlyFirst> {
         return result.build();
     }
 }
+

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

@@ -7,8 +7,9 @@ import 'package:built_value/serializer.dart';
 
 part 'special_model_name.g.dart';
 
-abstract class SpecialModelName
+
-    implements Built<SpecialModelName, SpecialModelNameBuilder> {
+
+abstract class SpecialModelName implements Built<SpecialModelName, SpecialModelNameBuilder> {
     @BuiltValueField(wireName: r'$special[property.name]')
     int? get dollarSpecialLeftSquareBracketPropertyPeriodNameRightSquareBracket;
 
@@ -16,16 +17,13 @@ abstract class SpecialModelName
 
     static void _initializeBuilder(SpecialModelNameBuilder b) => b;
 
-  factory SpecialModelName([void updates(SpecialModelNameBuilder b)]) =
+    factory SpecialModelName([void updates(SpecialModelNameBuilder b)]) = _$SpecialModelName;
-      _$SpecialModelName;
 
     @BuiltValueSerializer(custom: true)
-  static Serializer<SpecialModelName> get serializer =>
+    static Serializer<SpecialModelName> get serializer => _$SpecialModelNameSerializer();
-      _$SpecialModelNameSerializer();
 }
 
-class _$SpecialModelNameSerializer
+class _$SpecialModelNameSerializer implements StructuredSerializer<SpecialModelName> {
-    implements StructuredSerializer<SpecialModelName> {
     @override
     final Iterable<Type> types = const [SpecialModelName, _$SpecialModelName];
 
@@ -36,22 +34,17 @@ class _$SpecialModelNameSerializer
     Iterable<Object?> serialize(Serializers serializers, SpecialModelName object,
         {FullType specifiedType = FullType.unspecified}) {
         final result = <Object?>[];
-    if (object
+        if (object.dollarSpecialLeftSquareBracketPropertyPeriodNameRightSquareBracket != null) {
-            .dollarSpecialLeftSquareBracketPropertyPeriodNameRightSquareBracket !=
-        null) {
             result
                 ..add(r'$special[property.name]')
-        ..add(serializers.serialize(
+                ..add(serializers.serialize(object.dollarSpecialLeftSquareBracketPropertyPeriodNameRightSquareBracket,
-            object
-                .dollarSpecialLeftSquareBracketPropertyPeriodNameRightSquareBracket,
                     specifiedType: const FullType(int)));
         }
         return result;
     }
 
     @override
-  SpecialModelName deserialize(
+    SpecialModelName deserialize(Serializers serializers, Iterable<Object?> serialized,
-      Serializers serializers, Iterable<Object?> serialized,
         {FullType specifiedType = FullType.unspecified}) {
         final result = SpecialModelNameBuilder();
 
@@ -62,12 +55,12 @@ class _$SpecialModelNameSerializer
             final Object? value = iterator.current;
             switch (key) {
                 case r'$special[property.name]':
-          result.dollarSpecialLeftSquareBracketPropertyPeriodNameRightSquareBracket =
+                    result.dollarSpecialLeftSquareBracketPropertyPeriodNameRightSquareBracket = serializers.deserialize(value,
-              serializers.deserialize(value, specifiedType: const FullType(int))
+                        specifiedType: const FullType(int)) as int;
-                  as int;
                     break;
             }
         }
         return result.build();
     }
 }
+

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

@@ -7,6 +7,8 @@ import 'package:built_value/serializer.dart';
 
 part 'tag.g.dart';
 
+
+
 abstract class Tag implements Built<Tag, TagBuilder> {
     @BuiltValueField(wireName: r'id')
     int? get id;
@@ -74,3 +76,4 @@ class _$TagSerializer implements StructuredSerializer<Tag> {
         return result.build();
     }
 }
+

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

@@ -7,6 +7,8 @@ import 'package:built_value/serializer.dart';
 
 part 'user.g.dart';
 
+
+
 abstract class User implements Built<User, UserBuilder> {
     @BuiltValueField(wireName: r'id')
     int? get id;
@@ -153,3 +155,4 @@ class _$UserSerializer implements StructuredSerializer<User> {
         return result.build();
     }
 }
+

samples/openapi3/client/petstore/dart-dio-next/petstore_client_lib_fake/pom.xml

@@ -41,12 +41,6 @@
                     </execution>
                     <execution>
                         <id>format</id>
-                        <!--
-                        This needs to run before the build_runner so that we don't
-                        format by build_runner generated files.
-                        This should fail the build if there are format changes but
-                        requires https://github.com/dart-lang/sdk/issues/44582 to be fixed.
-                        -->
                         <phase>pre-integration-test</phase>
                         <goals>
                             <goal>exec</goal>
@@ -55,7 +49,11 @@
                             <executable>dart</executable>
                             <arguments>
                                 <argument>format</argument>
-                                <argument>--set-exit-if-changed</argument>
+                                <!--
+                                    Need to format first so that analyze can be run later.
+                                    But can not break the build with set-exit-if-changed
+                                    since sample files are not formatted.
+                                -->
                                 <argument>--output=none</argument>
                                 <argument>.</argument>
                             </arguments>