[dart][dio] Respect import-mappings parameter (#10528)

* 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
This commit is contained in:
Peter Leibiger 2021-10-13 09:55:45 +02:00 committed by GitHub
parent 71afbf5909
commit 34f475f7f7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 0 deletions

View File

@ -420,6 +420,8 @@ public class DartDioNextClientCodegen extends AbstractDartCodegen {
continue; continue;
} }
resultImports.add(i); resultImports.add(i);
} else if (importMapping().containsKey(modelImport)) {
resultImports.add(importMapping().get(modelImport));
} else { } else {
resultImports.add("package:" + pubName + "/src/model/" + underscore(modelImport) + ".dart"); resultImports.add("package:" + pubName + "/src/model/" + underscore(modelImport) + ".dart");
} }

View File

@ -105,7 +105,13 @@ class _${{classname}}Serializer implements StructuredSerializer<{{classname}}> {
result.{{{name}}}.replace(valueDes); result.{{{name}}}.replace(valueDes);
{{/isContainer}} {{/isContainer}}
{{#isModel}} {{#isModel}}
{{#isPrimitiveType}}
{{! These are models that have nee manually marked as primitve via generator param. }}
result.{{{name}}} = valueDes;
{{/isPrimitiveType}}
{{^isPrimitiveType}}
result.{{{name}}}.replace(valueDes); result.{{{name}}}.replace(valueDes);
{{/isPrimitiveType}}
{{/isModel}} {{/isModel}}
{{^isContainer}} {{^isContainer}}
{{^isModel}} {{^isModel}}