[dart-dio-next] Improve handling nullable objects

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

@@ -275,35 +275,7 @@ public void postProcessModelProperty(CodegenModel model, CodegenProperty propert
                 // enums are generated with built_value and make use of BuiltSet
                 model.imports.add("BuiltSet");
             }
-
-            property.getVendorExtensions().put("x-built-value-serializer-type", createBuiltValueSerializerType(property));
-        }
-    }
-
-    private String createBuiltValueSerializerType(CodegenProperty property) {
-        final StringBuilder sb = new StringBuilder("const FullType(");
-        if (property.isContainer) {
-            appendBuiltValueCollection(sb, property);
-        } else {
-            sb.append(property.datatypeWithEnum);
-        }
-        sb.append(")");
-        return sb.toString();
-    }
-
-    private void appendBuiltValueCollection(StringBuilder sb, CodegenProperty property) {
-        sb.append(property.baseType);
-        sb.append(", [FullType(");
-        if (property.isMap) {
-            // a map always has string keys
-            sb.append("String), FullType(");
-        }
-        if (property.items.isContainer) {
-            appendBuiltValueCollection(sb, property.items);
-        } else {
-            sb.append(property.items.datatypeWithEnum);
         }
-        sb.append(")]");
     }
 
     @Override

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

@@ -25,7 +25,7 @@ abstract class {{classname}} implements Built<{{classname}}, {{classname}}Builde
     /// {{{description}}}
     {{/description}}
     @BuiltValueField(wireName: r'{{baseName}}')
-    {{{datatypeWithEnum}}}{{#isNullable}}?{{/isNullable}}{{^isNullable}}{{^required}}?{{/required}}{{/isNullable}} get {{name}};
+    {{>serialization/built_value/variable_type}}{{^isNullable}}{{^required}}?{{/required}}{{/isNullable}} get {{name}};
     {{#allowableValues}}
     // {{#min}}range from {{{min}}} to {{{max}}}{{/min}}{{^min}}enum {{name}}Enum { {{#values}} {{{.}}}, {{/values}} };{{/min}}
     {{/allowableValues}}
@@ -67,15 +67,15 @@ class _${{classname}}Serializer implements StructuredSerializer<{{classname}}> {
         result
             ..add(r'{{baseName}}')
             ..add({{#isNullable}}object.{{{name}}} == null ? null : {{/isNullable}}serializers.serialize(object.{{{name}}},
-                specifiedType: {{{vendorExtensions.x-built-value-serializer-type}}}));
+                specifiedType: const {{>serialization/built_value/variable_serializer_type}}));
         {{/required}}
         {{^required}}
         if (object.{{{name}}} != null) {
             {{! Non-required properties are only serialized if not null. }}
             result
                 ..add(r'{{baseName}}')
                 ..add(serializers.serialize(object.{{{name}}},
-                    specifiedType: {{{vendorExtensions.x-built-value-serializer-type}}}));
+                    specifiedType: const {{>serialization/built_value/variable_serializer_type}}));
         }
         {{/required}}
         {{/vars}}
@@ -92,21 +92,24 @@ class _${{classname}}Serializer implements StructuredSerializer<{{classname}}> {
             final key = iterator.current as String;
             iterator.moveNext();
             final Object? value = iterator.current;
+
             switch (key) {
                 {{#vars}}
                 case r'{{baseName}}':
+                    final valueDes = serializers.deserialize(value,
+                        specifiedType: const {{>serialization/built_value/variable_serializer_type}}) as {{>serialization/built_value/variable_type}};
+                    {{#isNullable}}
+                    if (valueDes == null) continue;
+                    {{/isNullable}}
                     {{#isContainer}}
-                    result.{{{name}}}.replace(serializers.deserialize(value,
-                        specifiedType: {{{vendorExtensions.x-built-value-serializer-type}}}) as {{{datatypeWithEnum}}});
+                    result.{{{name}}}.replace(valueDes);
                     {{/isContainer}}
                     {{#isModel}}
-                    result.{{{name}}}.replace(serializers.deserialize(value,
-                        specifiedType: {{{vendorExtensions.x-built-value-serializer-type}}}) as {{{datatypeWithEnum}}});
+                    result.{{{name}}}.replace(valueDes);
                     {{/isModel}}
                     {{^isContainer}}
                     {{^isModel}}
-                    result.{{{name}}} = serializers.deserialize(value,
-                        specifiedType: {{{vendorExtensions.x-built-value-serializer-type}}}) as {{{datatypeWithEnum}}};
+                    result.{{{name}}} = valueDes;
                     {{/isModel}}
                     {{/isContainer}}
                     break;

modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/variable_serializer_type.mustache

@@ -0,0 +1 @@
+FullType{{#isNullable}}.nullable{{/isNullable}}({{#isContainer}}{{baseType}}, [{{#isMap}}FullType(String), {{/isMap}}{{#items}}{{>serialization/built_value/variable_serializer_type}}{{/items}}]{{/isContainer}}{{^isContainer}}{{{datatypeWithEnum}}}{{/isContainer}})

modules/openapi-generator/src/main/resources/dart/libraries/dio/serialization/built_value/variable_type.mustache

@@ -0,0 +1 @@
+{{#isContainer}}{{baseType}}<{{#isMap}}String, {{/isMap}}{{#items}}{{>serialization/built_value/variable_type}}{{/items}}>{{/isContainer}}{{^isContainer}}{{{datatypeWithEnum}}}{{/isContainer}}{{#isNullable}}?{{/isNullable}}

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

@@ -67,14 +67,17 @@ class _$AdditionalPropertiesClassSerializer implements StructuredSerializer<Addi
             final key = iterator.current as String;
             iterator.moveNext();
             final Object? value = iterator.current;
+
             switch (key) {
                 case r'map_property':
-                    result.mapProperty.replace(serializers.deserialize(value,
-                        specifiedType: const FullType(BuiltMap, [FullType(String), FullType(String)])) as BuiltMap<String, String>);
+                    final valueDes = serializers.deserialize(value,
+                        specifiedType: const FullType(BuiltMap, [FullType(String), FullType(String)])) as BuiltMap<String, String>;
+                    result.mapProperty.replace(valueDes);
                     break;
                 case r'map_of_map_property':
-                    result.mapOfMapProperty.replace(serializers.deserialize(value,
-                        specifiedType: const FullType(BuiltMap, [FullType(String), FullType(BuiltMap, [FullType(String), FullType(String)])])) as BuiltMap<String, BuiltMap<String, String>>);
+                    final valueDes = serializers.deserialize(value,
+                        specifiedType: const FullType(BuiltMap, [FullType(String), FullType(BuiltMap, [FullType(String), FullType(String)])])) as BuiltMap<String, BuiltMap<String, String>>;
+                    result.mapOfMapProperty.replace(valueDes);
                     break;
             }
         }

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

@@ -65,14 +65,17 @@ class _$AnimalSerializer implements StructuredSerializer<Animal> {
             final key = iterator.current as String;
             iterator.moveNext();
             final Object? value = iterator.current;
+
             switch (key) {
                 case r'className':
-                    result.className = serializers.deserialize(value,
+                    final valueDes = serializers.deserialize(value,
                         specifiedType: const FullType(String)) as String;
+                    result.className = valueDes;
                     break;
                 case r'color':
-                    result.color = serializers.deserialize(value,
+                    final valueDes = serializers.deserialize(value,
                         specifiedType: const FullType(String)) as String;
+                    result.color = valueDes;
                     break;
             }
         }

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

@@ -76,18 +76,22 @@ class _$ApiResponseSerializer implements StructuredSerializer<ApiResponse> {
             final key = iterator.current as String;
             iterator.moveNext();
             final Object? value = iterator.current;
+
             switch (key) {
                 case r'code':
-                    result.code = serializers.deserialize(value,
+                    final valueDes = serializers.deserialize(value,
                         specifiedType: const FullType(int)) as int;
+                    result.code = valueDes;
                     break;
                 case r'type':
-                    result.type = serializers.deserialize(value,
+                    final valueDes = serializers.deserialize(value,
                         specifiedType: const FullType(String)) as String;
+                    result.type = valueDes;
                     break;
                 case r'message':
-                    result.message = serializers.deserialize(value,
+                    final valueDes = serializers.deserialize(value,
                         specifiedType: const FullType(String)) as String;
+                    result.message = valueDes;
                     break;
             }
         }

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

@@ -57,10 +57,12 @@ class _$ArrayOfArrayOfNumberOnlySerializer implements StructuredSerializer<Array
             final key = iterator.current as String;
             iterator.moveNext();
             final Object? value = iterator.current;
+
             switch (key) {
                 case r'ArrayArrayNumber':
-                    result.arrayArrayNumber.replace(serializers.deserialize(value,
-                        specifiedType: const FullType(BuiltList, [FullType(BuiltList, [FullType(num)])])) as BuiltList<BuiltList<num>>);
+                    final valueDes = serializers.deserialize(value,
+                        specifiedType: const FullType(BuiltList, [FullType(BuiltList, [FullType(num)])])) as BuiltList<BuiltList<num>>;
+                    result.arrayArrayNumber.replace(valueDes);
                     break;
             }
         }

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

@@ -57,10 +57,12 @@ class _$ArrayOfNumberOnlySerializer implements StructuredSerializer<ArrayOfNumbe
             final key = iterator.current as String;
             iterator.moveNext();
             final Object? value = iterator.current;
+
             switch (key) {
                 case r'ArrayNumber':
-                    result.arrayNumber.replace(serializers.deserialize(value,
-                        specifiedType: const FullType(BuiltList, [FullType(num)])) as BuiltList<num>);
+                    final valueDes = serializers.deserialize(value,
+                        specifiedType: const FullType(BuiltList, [FullType(num)])) as BuiltList<num>;
+                    result.arrayNumber.replace(valueDes);
                     break;
             }
         }

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

@@ -78,18 +78,22 @@ class _$ArrayTestSerializer implements StructuredSerializer<ArrayTest> {
             final key = iterator.current as String;
             iterator.moveNext();
             final Object? value = iterator.current;
+
             switch (key) {
                 case r'array_of_string':
-                    result.arrayOfString.replace(serializers.deserialize(value,
-                        specifiedType: const FullType(BuiltList, [FullType(String)])) as BuiltList<String>);
+                    final valueDes = serializers.deserialize(value,
+                        specifiedType: const FullType(BuiltList, [FullType(String)])) as BuiltList<String>;
+                    result.arrayOfString.replace(valueDes);
                     break;
                 case r'array_array_of_integer':
-                    result.arrayArrayOfInteger.replace(serializers.deserialize(value,
-                        specifiedType: const FullType(BuiltList, [FullType(BuiltList, [FullType(int)])])) as BuiltList<BuiltList<int>>);
+                    final valueDes = serializers.deserialize(value,
+                        specifiedType: const FullType(BuiltList, [FullType(BuiltList, [FullType(int)])])) as BuiltList<BuiltList<int>>;
+                    result.arrayArrayOfInteger.replace(valueDes);
                     break;
                 case r'array_array_of_model':
-                    result.arrayArrayOfModel.replace(serializers.deserialize(value,
-                        specifiedType: const FullType(BuiltList, [FullType(BuiltList, [FullType(ReadOnlyFirst)])])) as BuiltList<BuiltList<ReadOnlyFirst>>);
+                    final valueDes = serializers.deserialize(value,
+                        specifiedType: const FullType(BuiltList, [FullType(BuiltList, [FullType(ReadOnlyFirst)])])) as BuiltList<BuiltList<ReadOnlyFirst>>;
+                    result.arrayArrayOfModel.replace(valueDes);
                     break;
             }
         }

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

@@ -107,30 +107,37 @@ class _$CapitalizationSerializer implements StructuredSerializer<Capitalization>
             final key = iterator.current as String;
             iterator.moveNext();
             final Object? value = iterator.current;
+
             switch (key) {
                 case r'smallCamel':
-                    result.smallCamel = serializers.deserialize(value,
+                    final valueDes = serializers.deserialize(value,
                         specifiedType: const FullType(String)) as String;
+                    result.smallCamel = valueDes;
                     break;
                 case r'CapitalCamel':
-                    result.capitalCamel = serializers.deserialize(value,
+                    final valueDes = serializers.deserialize(value,
                         specifiedType: const FullType(String)) as String;
+                    result.capitalCamel = valueDes;
                     break;
                 case r'small_Snake':
-                    result.smallSnake = serializers.deserialize(value,
+                    final valueDes = serializers.deserialize(value,
                         specifiedType: const FullType(String)) as String;
+                    result.smallSnake = valueDes;
                     break;
                 case r'Capital_Snake':
-                    result.capitalSnake = serializers.deserialize(value,
+                    final valueDes = serializers.deserialize(value,
                         specifiedType: const FullType(String)) as String;
+                    result.capitalSnake = valueDes;
                     break;
                 case r'SCA_ETH_Flow_Points':
-                    result.sCAETHFlowPoints = serializers.deserialize(value,
+                    final valueDes = serializers.deserialize(value,
                         specifiedType: const FullType(String)) as String;
+                    result.sCAETHFlowPoints = valueDes;
                     break;
                 case r'ATT_NAME':
-                    result.ATT_NAME = serializers.deserialize(value,
+                    final valueDes = serializers.deserialize(value,
                         specifiedType: const FullType(String)) as String;
+                    result.ATT_NAME = valueDes;
                     break;
             }
         }

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

@@ -79,18 +79,22 @@ class _$CatSerializer implements StructuredSerializer<Cat> {
             final key = iterator.current as String;
             iterator.moveNext();
             final Object? value = iterator.current;
+
             switch (key) {
                 case r'className':
-                    result.className = serializers.deserialize(value,
+                    final valueDes = serializers.deserialize(value,
                         specifiedType: const FullType(String)) as String;
+                    result.className = valueDes;
                     break;
                 case r'color':
-                    result.color = serializers.deserialize(value,
+                    final valueDes = serializers.deserialize(value,
                         specifiedType: const FullType(String)) as String;
+                    result.color = valueDes;
                     break;
                 case r'declawed':
-                    result.declawed = serializers.deserialize(value,
+                    final valueDes = serializers.deserialize(value,
                         specifiedType: const FullType(bool)) as bool;
+                    result.declawed = valueDes;
                     break;
             }
         }

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

@@ -56,10 +56,12 @@ class _$CatAllOfSerializer implements StructuredSerializer<CatAllOf> {
             final key = iterator.current as String;
             iterator.moveNext();
             final Object? value = iterator.current;
+
             switch (key) {
                 case r'declawed':
-                    result.declawed = serializers.deserialize(value,
+                    final valueDes = serializers.deserialize(value,
                         specifiedType: const FullType(bool)) as bool;
+                    result.declawed = valueDes;
                     break;
             }
         }

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

@@ -65,14 +65,17 @@ class _$CategorySerializer implements StructuredSerializer<Category> {
             final key = iterator.current as String;
             iterator.moveNext();
             final Object? value = iterator.current;
+
             switch (key) {
                 case r'id':
-                    result.id = serializers.deserialize(value,
+                    final valueDes = serializers.deserialize(value,
                         specifiedType: const FullType(int)) as int;
+                    result.id = valueDes;
                     break;
                 case r'name':
-                    result.name = serializers.deserialize(value,
+                    final valueDes = serializers.deserialize(value,
                         specifiedType: const FullType(String)) as String;
+                    result.name = valueDes;
                     break;
             }
         }

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

@@ -56,10 +56,12 @@ class _$ClassModelSerializer implements StructuredSerializer<ClassModel> {
             final key = iterator.current as String;
             iterator.moveNext();
             final Object? value = iterator.current;
+
             switch (key) {
                 case r'_class':
-                    result.class_ = serializers.deserialize(value,
+                    final valueDes = serializers.deserialize(value,
                         specifiedType: const FullType(String)) as String;
+                    result.class_ = valueDes;
                     break;
             }
         }

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

@@ -56,10 +56,12 @@ class _$DeprecatedObjectSerializer implements StructuredSerializer<DeprecatedObj
             final key = iterator.current as String;
             iterator.moveNext();
             final Object? value = iterator.current;
+
             switch (key) {
                 case r'name':
-                    result.name = serializers.deserialize(value,
+                    final valueDes = serializers.deserialize(value,
                         specifiedType: const FullType(String)) as String;
+                    result.name = valueDes;
                     break;
             }
         }

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

@@ -79,18 +79,22 @@ class _$DogSerializer implements StructuredSerializer<Dog> {
             final key = iterator.current as String;
             iterator.moveNext();
             final Object? value = iterator.current;
+
             switch (key) {
                 case r'className':
-                    result.className = serializers.deserialize(value,
+                    final valueDes = serializers.deserialize(value,
                         specifiedType: const FullType(String)) as String;
+                    result.className = valueDes;
                     break;
                 case r'color':
-                    result.color = serializers.deserialize(value,
+                    final valueDes = serializers.deserialize(value,
                         specifiedType: const FullType(String)) as String;
+                    result.color = valueDes;
                     break;
                 case r'breed':
-                    result.breed = serializers.deserialize(value,
+                    final valueDes = serializers.deserialize(value,
                         specifiedType: const FullType(String)) as String;
+                    result.breed = valueDes;
                     break;
             }
         }