fix duplicate builder factories and regenerate petstore sample

Author: a-ledu

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

@@ -683,16 +683,29 @@ private void registerNestedBuilderFactories(CodegenProperty prop) {
         if (prop == null || !prop.isContainer || prop.items == null) {
             return;
         }
-        // Recurse first so deeper containers are registered too. Order
-        // doesn't matter for correctness (built_value resolves factories
-        // by FullType lookup), but it keeps the emitted list intuitive.
+        // Recurse first so deeper containers are registered too.
         registerNestedBuilderFactories(prop.items);
 
-        BuilderFactoryExpr expr = renderBuilderFactory(prop);
-        if (expr != null) {
-            addBuiltValueSerializer(BuiltValueSerializer.composite(
-                    expr.fullTypeArgs,
-                    expr.builderInstantiation));
+        if (prop.items.isContainer) {
+            // Truly nested container (e.g. Map<String, List<X>>):
+            // must use composite form because the simple constructor
+            // cannot express the nested FullType.
+            BuilderFactoryExpr expr = renderBuilderFactory(prop);
+            if (expr != null) {
+                addBuiltValueSerializer(BuiltValueSerializer.composite(
+                        expr.fullTypeArgs,
+                        expr.builderInstantiation));
+            }
+        } else {
+            // Leaf container (e.g. List<X>, Map<String, X>): use the
+            // same simple constructor the rest of the codegen uses so
+            // the Set deduplicates correctly.
+            addBuiltValueSerializer(new BuiltValueSerializer(
+                    prop.isArray,
+                    prop.getUniqueItems(),
+                    prop.isMap,
+                    prop.items.isNullable,
+                    prop.items.dataType));
         }
     }
 

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

@@ -136,6 +136,42 @@ Serializers serializers = (_$serializers.toBuilder()
         const FullType(BuiltMap, [FullType(String), FullType(String)]),
         () => MapBuilder<String, String>(),
       )
+      ..addBuilderFactory(
+        const FullType(BuiltList, [FullType(BuiltList, [FullType(int)])]),
+        () => ListBuilder<BuiltList<int>>(),
+      )
+      ..addBuilderFactory(
+        const FullType(BuiltMap, [FullType(String), FullType(num)]),
+        () => MapBuilder<String, num>(),
+      )
+      ..addBuilderFactory(
+        const FullType(BuiltMap, [FullType(String), FullType(Animal)]),
+        () => MapBuilder<String, Animal>(),
+      )
+      ..addBuilderFactory(
+        const FullType(BuiltList, [FullType(ReadOnlyFirst)]),
+        () => ListBuilder<ReadOnlyFirst>(),
+      )
+      ..addBuilderFactory(
+        const FullType(BuiltList, [FullType(BuiltList, [FullType(ReadOnlyFirst)])]),
+        () => ListBuilder<BuiltList<ReadOnlyFirst>>(),
+      )
+      ..addBuilderFactory(
+        const FullType(BuiltMap, [FullType(String), FullType(BuiltMap, [FullType(String), FullType(String)])]),
+        () => MapBuilder<String, BuiltMap<String, String>>(),
+      )
+      ..addBuilderFactory(
+        const FullType(BuiltMap, [FullType(String), FullType(int)]),
+        () => MapBuilder<String, int>(),
+      )
+      ..addBuilderFactory(
+        const FullType(BuiltList, [FullType(BuiltList, [FullType(num)])]),
+        () => ListBuilder<BuiltList<num>>(),
+      )
+      ..addBuilderFactory(
+        const FullType(BuiltList, [FullType(num)]),
+        () => ListBuilder<num>(),
+      )
       ..addBuilderFactory(
         const FullType(BuiltList, [FullType(User)]),
         () => ListBuilder<User>(),
@@ -144,6 +180,10 @@ Serializers serializers = (_$serializers.toBuilder()
         const FullType(BuiltSet, [FullType(String)]),
         () => SetBuilder<String>(),
       )
+      ..addBuilderFactory(
+        const FullType(BuiltMap, [FullType(String), FullType(BuiltList, [FullType(int)])]),
+        () => MapBuilder<String, BuiltList<int>>(),
+      )
       ..addBuilderFactory(
         const FullType(BuiltSet, [FullType(Pet)]),
         () => SetBuilder<Pet>(),
@@ -153,21 +193,45 @@ Serializers serializers = (_$serializers.toBuilder()
         () => ListBuilder<Pet>(),
       )
       ..addBuilderFactory(
-        const FullType(BuiltMap, [FullType(String), FullType.nullable(JsonObject)]),
-        () => MapBuilder<String, JsonObject?>(),
-      )
-      ..addBuilderFactory(
-        const FullType(BuiltMap, [FullType(String), FullType(int)]),
-        () => MapBuilder<String, int>(),
+        const FullType(BuiltList, [FullType(JsonObject)]),
+        () => ListBuilder<JsonObject>(),
       )
       ..addBuilderFactory(
         const FullType(BuiltList, [FullType(ModelEnumClass)]),
         () => ListBuilder<ModelEnumClass>(),
       )
+      ..addBuilderFactory(
+        const FullType(BuiltList, [FullType.nullable(JsonObject)]),
+        () => ListBuilder<JsonObject>(),
+      )
+      ..addBuilderFactory(
+        const FullType(BuiltList, [FullType(Tag)]),
+        () => ListBuilder<Tag>(),
+      )
+      ..addBuilderFactory(
+        const FullType(BuiltList, [FullType(ModelFile)]),
+        () => ListBuilder<ModelFile>(),
+      )
+      ..addBuilderFactory(
+        const FullType(BuiltList, [FullType(int)]),
+        () => ListBuilder<int>(),
+      )
+      ..addBuilderFactory(
+        const FullType(BuiltMap, [FullType(String), FullType.nullable(JsonObject)]),
+        () => MapBuilder<String, JsonObject?>(),
+      )
+      ..addBuilderFactory(
+        const FullType(BuiltMap, [FullType(String), FullType(bool)]),
+        () => MapBuilder<String, bool>(),
+      )
       ..addBuilderFactory(
         const FullType(BuiltList, [FullType(String)]),
         () => ListBuilder<String>(),
       )
+      ..addBuilderFactory(
+        const FullType(BuiltMap, [FullType(String), FullType(JsonObject)]),
+        () => MapBuilder<String, JsonObject>(),
+      )
       ..add(Animal.serializer)
       ..add(ParentWithNullable.serializer)
       ..add(const OneOfSerializer())