[dart-dio] Correctly handles import of Uint8List

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

@@ -78,8 +78,9 @@ public DartDioClientCodegen() {
         typeMapping.put("file", "Uint8List");
         typeMapping.put("binary", "Uint8List");
 
-        importMapping.put("BuiltList", "built_collection/built_collection");
-        importMapping.put("BuiltMap", "built_collection/built_collection");
+        importMapping.put("BuiltList", "package:built_collection/built_collection.dart");
+        importMapping.put("BuiltMap", "package:built_collection/built_collection.dart");
+        importMapping.put("Uint8List", "dart:typed_data");
     }
 
     @Override
@@ -208,7 +209,7 @@ public Map<String, Object> postProcessModels(Map<String, Object> objs) {
                     modelImports.add(importMapping.get(modelImport));
                 } else {
                     if (!modelToIgnore.contains(modelImport.toLowerCase(Locale.ROOT))) {
-                        modelImports.add(pubName + "/model/" + underscore(modelImport));
+                        modelImports.add("package:" + pubName + "/model/" + underscore(modelImport) + ".dart");
                     }
                 }
             }

modules/openapi-generator/src/main/resources/dart-dio/model.mustache

@@ -1,7 +1,7 @@
 {{#models}}
     {{#model}}
         {{#imports}}
-            import 'package:{{.}}.dart';
+            import '{{.}}';
         {{/imports}}
         {{#isEnum}}{{>enum}}{{/isEnum}}{{^isEnum}}{{>class}}{{/isEnum}}
     {{/model}}

modules/openapi-generator/src/main/resources/dart-dio/pubspec.mustache

@@ -4,10 +4,10 @@ description: {{pubDescription}}
 environment:
     sdk: ">=2.3.0 <3.0.0"
 dependencies:
-    dio: ^3.0.3
-    built_value: 6.7.0
-    built_collection: 4.2.2
+    dio: ^3.0.4
+    built_value: ^6.8.2
+    built_collection: ^4.2.2
 dev_dependencies:
-    built_value_generator: ^6.7.1
+    built_value_generator: ^6.8.2
     build_runner: ^1.7.1
     test: 1.6.5

samples/client/petstore/dart-dio/README.md

@@ -4,6 +4,7 @@ This is a sample server Petstore server. For this sample, you can use the api ke
 This Dart package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
 
 - API version: 1.0.0
+- Build date: 2019-10-30T08:32:55.947+13:00[Pacific/Auckland]
 - Build package: org.openapitools.codegen.languages.DartDioClientCodegen
 
 ## Requirements

samples/client/petstore/dart-dio/lib/api.dart

@@ -8,52 +8,45 @@ import 'package:openapi/api/pet_api.dart';
 import 'package:openapi/api/store_api.dart';
 import 'package:openapi/api/user_api.dart';
 
-
 class Openapi {
+  Dio dio;
+  Serializers serializers;
+  String basePath = "http://petstore.swagger.io/v2";
 
-    Dio dio;
-    Serializers serializers;
-    String basePath = "http://petstore.swagger.io/v2";
-
-    Openapi({this.dio, Serializers serializers}) {
+  Openapi({this.dio, Serializers serializers}) {
     if (dio == null) {
-        BaseOptions options = new BaseOptions(
-            baseUrl: basePath,
-            connectTimeout: 5000,
-            receiveTimeout: 3000,
-        );
-        this.dio = new Dio(options);
+      BaseOptions options = new BaseOptions(
+        baseUrl: basePath,
+        connectTimeout: 5000,
+        receiveTimeout: 3000,
+      );
+      this.dio = new Dio(options);
     }
 
     this.serializers = serializers ?? standardSerializers;
-}
+  }
 
-
-    /**
+  /**
     * Get PetApi instance, base route and serializer can be overridden by a given but be careful,
     * by doing that all interceptors will not be executed
     */
-    PetApi getPetApi() {
+  PetApi getPetApi() {
     return PetApi(dio, serializers);
-    }
-
+  }
 
-    /**
+  /**
     * Get StoreApi instance, base route and serializer can be overridden by a given but be careful,
     * by doing that all interceptors will not be executed
     */
-    StoreApi getStoreApi() {
+  StoreApi getStoreApi() {
     return StoreApi(dio, serializers);
-    }
-
+  }
 
-    /**
+  /**
     * Get UserApi instance, base route and serializer can be overridden by a given but be careful,
     * by doing that all interceptors will not be executed
     */
-    UserApi getUserApi() {
+  UserApi getUserApi() {
     return UserApi(dio, serializers);
-    }
-
-
-}
+  }
+}