[dart][dio] Respect import-mappings parameter

* first check import mappings before defaulting to model import * respect primitive types when generating serializes, these can still be models if passed via generator args
OpenAPITools · Oct 10, 2021 · 4b16589 · 4b16589
1 parent efa032a
commit 4b16589
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 0 deletions.
diff --git a/...-generator/src/main/java/org/openapitools/codegen/languages/DartDioNextClientCodegen.java b/...-generator/src/main/java/org/openapitools/codegen/languages/DartDioNextClientCodegen.java
@@ -420,6 +420,8 @@ private Set<String> rewriteImports(Set<String> originalImports, boolean isModel)
                     continue;
                 }
                 resultImports.add(i);
+            } else if (importMapping().containsKey(modelImport)) {
+                resultImports.add(importMapping().get(modelImport));
             } else {
                 resultImports.add("package:" + pubName + "/src/model/" + underscore(modelImport) + ".dart");
             }

diff --git a/...-generator/src/main/resources/dart/libraries/dio/serialization/built_value/class.mustache b/...-generator/src/main/resources/dart/libraries/dio/serialization/built_value/class.mustache
@@ -105,7 +105,13 @@ class _${{classname}}Serializer implements StructuredSerializer<{{classname}}> {
                     result.{{{name}}}.replace(valueDes);
                     {{/isContainer}}
                     {{#isModel}}
+                    {{#isPrimitiveType}}
+                    {{! These are models that have nee manually marked as primitve via generator param. }}
+                    result.{{{name}}} = valueDes;
+                    {{/isPrimitiveType}}
+                    {{^isPrimitiveType}}
                     result.{{{name}}}.replace(valueDes);
+                    {{/isPrimitiveType}}
                     {{/isModel}}
                     {{^isContainer}}
                     {{^isModel}}