[DART2]: fix Map<String, nativeType> fromJson (#1936)

modules/openapi-generator/src/main/resources/dart2/class.mustache

@@ -42,10 +42,15 @@ class {{classname}} {
     {{/complexType}}
     {{^complexType}}
       {{#isListContainer}}
-      {{name}} = (json['{{baseName}}'] as List).map((item) => item as {{items.datatype}}).toList();
+      {{name}} = (json['{{baseName}}'] as List).cast<{{items.datatype}}>();
       {{/isListContainer}}
       {{^isListContainer}}
-      {{name}} = json['{{baseName}}'];
+        {{#isMapContainer}}
+          {{name}} = (json['{{baseName}}'] as Map).cast<String, {{items.datatype}}>();
+        {{/isMapContainer}}
+        {{^isMapContainer}}
+          {{name}} = json['{{baseName}}'];
+        {{/isMapContainer}}
       {{/isListContainer}}
     {{/complexType}}
   {{/isDate}}

samples/client/petstore/dart-jaguar/flutter_petstore/openapi/.openapi-generator/VERSION

@@ -1 +1 @@
-3.3.1-SNAPSHOT
+4.0.0-SNAPSHOT

samples/client/petstore/dart-jaguar/flutter_petstore/openapi/README.md

@@ -4,7 +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 [Open API Codegen](https://github.com/OpenAPITools/openapi-generator) project:
 
 - API version: 1.0.0
-- Build date: 2018-12-02T16:16:44.701611+01:00[Europe/Paris]
+- Build date: 2019-01-17T18:23:25.026381+01:00[Europe/Vienna]
 - Build package: org.openapitools.codegen.languages.DartJaguarClientCodegen
 
 ## Requirements
@@ -57,10 +57,10 @@ import 'package:openapi/api.dart';
 
 final jaguarApiGen = JaguarApiGen();
 var api_instance = jaguarApiGen.getPetApi();
-var pet = new Pet(); // Pet | Pet object that needs to be added to the store
+var body = new Pet(); // Pet | Pet object that needs to be added to the store
 
 try {
-    api_instance.addPet(pet);
+    api_instance.addPet(body);
 } catch (e) {
     print("Exception when calling PetApi->addPet: $e\n");
 }

samples/client/petstore/dart-jaguar/flutter_petstore/openapi/docs/PetApi.md

@@ -20,7 +20,7 @@ Method | HTTP request | Description
 
 
 # **addPet**
-> addPet(pet)
+> addPet(body)
 
 Add a new pet to the store
 
@@ -31,10 +31,10 @@ import 'package:openapi/api.dart';
 //openapi.api.Configuration.accessToken = 'YOUR_ACCESS_TOKEN';
 
 var api_instance = new PetApi();
-var pet = new Pet(); // Pet | Pet object that needs to be added to the store
+var body = new Pet(); // Pet | Pet object that needs to be added to the store
 
 try { 
-    api_instance.addPet(pet);
+    api_instance.addPet(body);
 } catch (e) {
     print("Exception when calling PetApi->addPet: $e\n");
 }
@@ -44,7 +44,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **pet** | [**Pet**](Pet.md)| Pet object that needs to be added to the store | 
+ **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store | 
 
 ### Return type
 
@@ -243,7 +243,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updatePet**
-> updatePet(pet)
+> updatePet(body)
 
 Update an existing pet
 
@@ -254,10 +254,10 @@ import 'package:openapi/api.dart';
 //openapi.api.Configuration.accessToken = 'YOUR_ACCESS_TOKEN';
 
 var api_instance = new PetApi();
-var pet = new Pet(); // Pet | Pet object that needs to be added to the store
+var body = new Pet(); // Pet | Pet object that needs to be added to the store
 
 try { 
-    api_instance.updatePet(pet);
+    api_instance.updatePet(body);
 } catch (e) {
     print("Exception when calling PetApi->updatePet: $e\n");
 }
@@ -267,7 +267,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **pet** | [**Pet**](Pet.md)| Pet object that needs to be added to the store | 
+ **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store | 
 
 ### Return type
 

samples/client/petstore/dart-jaguar/flutter_petstore/openapi/docs/StoreApi.md

@@ -144,7 +144,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **placeOrder**
-> Order placeOrder(order)
+> Order placeOrder(body)
 
 Place an order for a pet
 
@@ -153,10 +153,10 @@ Place an order for a pet
 import 'package:openapi/api.dart';
 
 var api_instance = new StoreApi();
-var order = new Order(); // Order | order placed for purchasing the pet
+var body = new Order(); // Order | order placed for purchasing the pet
 
 try { 
-    var result = api_instance.placeOrder(order);
+    var result = api_instance.placeOrder(body);
     print(result);
 } catch (e) {
     print("Exception when calling StoreApi->placeOrder: $e\n");
@@ -167,7 +167,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **order** | [**Order**](Order.md)| order placed for purchasing the pet | 
+ **body** | [**Order**](Order.md)| order placed for purchasing the pet | 
 
 ### Return type
 

samples/client/petstore/dart-jaguar/flutter_petstore/openapi/docs/UserApi.md

@@ -20,7 +20,7 @@ Method | HTTP request | Description
 
 
 # **createUser**
-> createUser(user)
+> createUser(body)
 
 Create user
 
@@ -31,10 +31,10 @@ This can only be done by the logged in user.
 import 'package:openapi/api.dart';
 
 var api_instance = new UserApi();
-var user = new User(); // User | Created user object
+var body = new User(); // User | Created user object
 
 try { 
-    api_instance.createUser(user);
+    api_instance.createUser(body);
 } catch (e) {
     print("Exception when calling UserApi->createUser: $e\n");
 }
@@ -44,7 +44,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **user** | [**User**](User.md)| Created user object | 
+ **body** | [**User**](User.md)| Created user object | 
 
 ### Return type
 
@@ -62,7 +62,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createUsersWithArrayInput**
-> createUsersWithArrayInput(user)
+> createUsersWithArrayInput(body)
 
 Creates list of users with given input array
 
@@ -71,10 +71,10 @@ Creates list of users with given input array
 import 'package:openapi/api.dart';
 
 var api_instance = new UserApi();
-var user = [new List&lt;User&gt;()]; // List<User> | List of user object
+var body = [new List&lt;User&gt;()]; // List<User> | List of user object
 
 try { 
-    api_instance.createUsersWithArrayInput(user);
+    api_instance.createUsersWithArrayInput(body);
 } catch (e) {
     print("Exception when calling UserApi->createUsersWithArrayInput: $e\n");
 }
@@ -84,7 +84,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **user** | [**List&lt;User&gt;**](List.md)| List of user object | 
+ **body** | [**List&lt;User&gt;**](List.md)| List of user object | 
 
 ### Return type
 
@@ -102,7 +102,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createUsersWithListInput**
-> createUsersWithListInput(user)
+> createUsersWithListInput(body)
 
 Creates list of users with given input array
 
@@ -111,10 +111,10 @@ Creates list of users with given input array
 import 'package:openapi/api.dart';
 
 var api_instance = new UserApi();
-var user = [new List&lt;User&gt;()]; // List<User> | List of user object
+var body = [new List&lt;User&gt;()]; // List<User> | List of user object
 
 try { 
-    api_instance.createUsersWithListInput(user);
+    api_instance.createUsersWithListInput(body);
 } catch (e) {
     print("Exception when calling UserApi->createUsersWithListInput: $e\n");
 }
@@ -124,7 +124,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **user** | [**List&lt;User&gt;**](List.md)| List of user object | 
+ **body** | [**List&lt;User&gt;**](List.md)| List of user object | 
 
 ### Return type
 
@@ -304,7 +304,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateUser**
-> updateUser(username, user)
+> updateUser(username, body)
 
 Updated user
 
@@ -316,10 +316,10 @@ import 'package:openapi/api.dart';
 
 var api_instance = new UserApi();
 var username = username_example; // String | name that need to be deleted
-var user = new User(); // User | Updated user object
+var body = new User(); // User | Updated user object
 
 try { 
-    api_instance.updateUser(username, user);
+    api_instance.updateUser(username, body);
 } catch (e) {
     print("Exception when calling UserApi->updateUser: $e\n");
 }
@@ -330,7 +330,7 @@ try {
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **username** | **String**| name that need to be deleted | [default to null]
- **user** | [**User**](User.md)| Updated user object | 
+ **body** | [**User**](User.md)| Updated user object | 
 
 ### Return type
 

samples/client/petstore/dart-jaguar/flutter_petstore/openapi/lib/api/pet_api.dart

@@ -24,12 +24,12 @@ class PetApi extends _$PetApiClient implements ApiClient {
     @PostReq(path: "/pet", metadata: {"auth": [ {"type": "oauth2", "name": "petstore_auth" }]})
     Future<void> addPet(
             
-              @AsJson() Pet pet
+              @AsJson() Pet body
         ) {
         return super.addPet(
 
         
-        pet
+        body
         ).timeout(timeout);
     }
 
@@ -99,12 +99,12 @@ class PetApi extends _$PetApiClient implements ApiClient {
     @PutReq(path: "/pet", metadata: {"auth": [ {"type": "oauth2", "name": "petstore_auth" }]})
     Future<void> updatePet(
             
-              @AsJson() Pet pet
+              @AsJson() Pet body
         ) {
         return super.updatePet(
 
         
-        pet
+        body
         ).timeout(timeout);
     }
 

samples/client/petstore/dart-jaguar/flutter_petstore/openapi/lib/api/store_api.dart

@@ -60,12 +60,12 @@ class StoreApi extends _$StoreApiClient implements ApiClient {
     @PostReq(path: "/store/order")
     Future<Order> placeOrder(
             
-              @AsJson() Order order
+              @AsJson() Order body
         ) {
         return super.placeOrder(
 
         
-        order
+        body
         ).timeout(timeout);
     }
 

samples/client/petstore/dart-jaguar/flutter_petstore/openapi/lib/api/user_api.dart

@@ -23,12 +23,12 @@ class UserApi extends _$UserApiClient implements ApiClient {
     @PostReq(path: "/user")
     Future<void> createUser(
             
-              @AsJson() User user
+              @AsJson() User body
         ) {
         return super.createUser(
 
         
-        user
+        body
         ).timeout(timeout);
     }
 
@@ -38,12 +38,12 @@ class UserApi extends _$UserApiClient implements ApiClient {
     @PostReq(path: "/user/createWithArray")
     Future<void> createUsersWithArrayInput(
             
-              @AsJson() List<User> user
+              @AsJson() List<User> body
         ) {
         return super.createUsersWithArrayInput(
 
         
-        user
+        body
         ).timeout(timeout);
     }
 
@@ -53,12 +53,12 @@ class UserApi extends _$UserApiClient implements ApiClient {
     @PostReq(path: "/user/createWithList")
     Future<void> createUsersWithListInput(
             
-              @AsJson() List<User> user
+              @AsJson() List<User> body
         ) {
         return super.createUsersWithListInput(
 
         
-        user
+        body
         ).timeout(timeout);
     }
 
@@ -125,13 +125,13 @@ class UserApi extends _$UserApiClient implements ApiClient {
     Future<void> updateUser(
             @PathParam("username") String username
             ,
-              @AsJson() User user
+              @AsJson() User body
         ) {
         return super.updateUser(
         username
 
         ,
-        user
+        body
         ).timeout(timeout);
     }
 

samples/client/petstore/dart-jaguar/flutter_petstore/openapi/lib/auth/auth.dart

@@ -3,21 +3,21 @@ import 'dart:async';
 import 'package:jaguar_retrofit/jaguar_retrofit.dart';
 
 abstract class AuthInterceptor extends Interceptor {
-  /*
+    /*
      * Get auth information on given route for the given type
      * Can return null if type is not present on auth data or if route doesn't need authentication
      */
-  List<Map<String, dynamic>> getAuthInfo(RouteBase route, String type) {
-    if (route.metadataMap.containsKey("auth")) {
-      final auth = route.metadataMap["auth"];
-      List<Map<String, dynamic>> results = [];
-      for (var info in auth) {
-        if (info["type"] == type) {
-          results.add(info);
+    List<Map<String, dynamic>> getAuthInfo(RouteBase route, String type) {
+        if (route.metadataMap.containsKey("auth")) {
+            final auth = route.metadataMap["auth"];
+            List<Map<String, dynamic>> results = [];
+            for (var info in auth) {
+                if(info["type"] == type) {
+                    results.add(info);
+                }
+            }
+            return results;
         }
-      }
-      return results;
+        return [];
     }
-    return [];
-  }
-}
+}

samples/client/petstore/dart-jaguar/openapi/.openapi-generator/VERSION

@@ -1 +1 @@
-3.3.1-SNAPSHOT
+4.0.0-SNAPSHOT

samples/client/petstore/dart-jaguar/openapi/README.md

@@ -4,7 +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 [Open API Codegen](https://github.com/OpenAPITools/openapi-generator) project:
 
 - API version: 1.0.0
-- Build date: 2018-12-02T16:16:43.185605+01:00[Europe/Paris]
+- Build date: 2019-01-17T18:23:23.279159+01:00[Europe/Vienna]
 - Build package: org.openapitools.codegen.languages.DartJaguarClientCodegen
 
 ## Requirements
@@ -57,10 +57,10 @@ import 'package:openapi/api.dart';
 
 final jaguarApiGen = JaguarApiGen();
 var api_instance = jaguarApiGen.getPetApi();
-var pet = new Pet(); // Pet | Pet object that needs to be added to the store
+var body = new Pet(); // Pet | Pet object that needs to be added to the store
 
 try {
-    api_instance.addPet(pet);
+    api_instance.addPet(body);
 } catch (e) {
     print("Exception when calling PetApi->addPet: $e\n");
 }

samples/client/petstore/dart-jaguar/openapi/docs/PetApi.md

@@ -20,7 +20,7 @@ Method | HTTP request | Description
 
 
 # **addPet**
-> addPet(pet)
+> addPet(body)
 
 Add a new pet to the store
 
@@ -31,10 +31,10 @@ import 'package:openapi/api.dart';
 //openapi.api.Configuration.accessToken = 'YOUR_ACCESS_TOKEN';
 
 var api_instance = new PetApi();
-var pet = new Pet(); // Pet | Pet object that needs to be added to the store
+var body = new Pet(); // Pet | Pet object that needs to be added to the store
 
 try { 
-    api_instance.addPet(pet);
+    api_instance.addPet(body);
 } catch (e) {
     print("Exception when calling PetApi->addPet: $e\n");
 }
@@ -44,7 +44,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **pet** | [**Pet**](Pet.md)| Pet object that needs to be added to the store | 
+ **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store | 
 
 ### Return type
 
@@ -243,7 +243,7 @@ Name | Type | Description  | Notes
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updatePet**
-> updatePet(pet)
+> updatePet(body)
 
 Update an existing pet
 
@@ -254,10 +254,10 @@ import 'package:openapi/api.dart';
 //openapi.api.Configuration.accessToken = 'YOUR_ACCESS_TOKEN';
 
 var api_instance = new PetApi();
-var pet = new Pet(); // Pet | Pet object that needs to be added to the store
+var body = new Pet(); // Pet | Pet object that needs to be added to the store
 
 try { 
-    api_instance.updatePet(pet);
+    api_instance.updatePet(body);
 } catch (e) {
     print("Exception when calling PetApi->updatePet: $e\n");
 }
@@ -267,7 +267,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **pet** | [**Pet**](Pet.md)| Pet object that needs to be added to the store | 
+ **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store | 
 
 ### Return type
 

samples/client/petstore/dart-jaguar/openapi/docs/StoreApi.md

@@ -144,7 +144,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **placeOrder**
-> Order placeOrder(order)
+> Order placeOrder(body)
 
 Place an order for a pet
 
@@ -153,10 +153,10 @@ Place an order for a pet
 import 'package:openapi/api.dart';
 
 var api_instance = new StoreApi();
-var order = new Order(); // Order | order placed for purchasing the pet
+var body = new Order(); // Order | order placed for purchasing the pet
 
 try { 
-    var result = api_instance.placeOrder(order);
+    var result = api_instance.placeOrder(body);
     print(result);
 } catch (e) {
     print("Exception when calling StoreApi->placeOrder: $e\n");
@@ -167,7 +167,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **order** | [**Order**](Order.md)| order placed for purchasing the pet | 
+ **body** | [**Order**](Order.md)| order placed for purchasing the pet | 
 
 ### Return type
 

samples/client/petstore/dart-jaguar/openapi/docs/UserApi.md

@@ -20,7 +20,7 @@ Method | HTTP request | Description
 
 
 # **createUser**
-> createUser(user)
+> createUser(body)
 
 Create user
 
@@ -31,10 +31,10 @@ This can only be done by the logged in user.
 import 'package:openapi/api.dart';
 
 var api_instance = new UserApi();
-var user = new User(); // User | Created user object
+var body = new User(); // User | Created user object
 
 try { 
-    api_instance.createUser(user);
+    api_instance.createUser(body);
 } catch (e) {
     print("Exception when calling UserApi->createUser: $e\n");
 }
@@ -44,7 +44,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **user** | [**User**](User.md)| Created user object | 
+ **body** | [**User**](User.md)| Created user object | 
 
 ### Return type
 
@@ -62,7 +62,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createUsersWithArrayInput**
-> createUsersWithArrayInput(user)
+> createUsersWithArrayInput(body)
 
 Creates list of users with given input array
 
@@ -71,10 +71,10 @@ Creates list of users with given input array
 import 'package:openapi/api.dart';
 
 var api_instance = new UserApi();
-var user = [new List&lt;User&gt;()]; // List<User> | List of user object
+var body = [new List&lt;User&gt;()]; // List<User> | List of user object
 
 try { 
-    api_instance.createUsersWithArrayInput(user);
+    api_instance.createUsersWithArrayInput(body);
 } catch (e) {
     print("Exception when calling UserApi->createUsersWithArrayInput: $e\n");
 }
@@ -84,7 +84,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **user** | [**List&lt;User&gt;**](List.md)| List of user object | 
+ **body** | [**List&lt;User&gt;**](List.md)| List of user object | 
 
 ### Return type
 
@@ -102,7 +102,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **createUsersWithListInput**
-> createUsersWithListInput(user)
+> createUsersWithListInput(body)
 
 Creates list of users with given input array
 
@@ -111,10 +111,10 @@ Creates list of users with given input array
 import 'package:openapi/api.dart';
 
 var api_instance = new UserApi();
-var user = [new List&lt;User&gt;()]; // List<User> | List of user object
+var body = [new List&lt;User&gt;()]; // List<User> | List of user object
 
 try { 
-    api_instance.createUsersWithListInput(user);
+    api_instance.createUsersWithListInput(body);
 } catch (e) {
     print("Exception when calling UserApi->createUsersWithListInput: $e\n");
 }
@@ -124,7 +124,7 @@ try {
 
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
- **user** | [**List&lt;User&gt;**](List.md)| List of user object | 
+ **body** | [**List&lt;User&gt;**](List.md)| List of user object | 
 
 ### Return type
 
@@ -304,7 +304,7 @@ No authorization required
 [[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
 
 # **updateUser**
-> updateUser(username, user)
+> updateUser(username, body)
 
 Updated user
 
@@ -316,10 +316,10 @@ import 'package:openapi/api.dart';
 
 var api_instance = new UserApi();
 var username = username_example; // String | name that need to be deleted
-var user = new User(); // User | Updated user object
+var body = new User(); // User | Updated user object
 
 try { 
-    api_instance.updateUser(username, user);
+    api_instance.updateUser(username, body);
 } catch (e) {
     print("Exception when calling UserApi->updateUser: $e\n");
 }
@@ -330,7 +330,7 @@ try {
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **username** | **String**| name that need to be deleted | [default to null]
- **user** | [**User**](User.md)| Updated user object | 
+ **body** | [**User**](User.md)| Updated user object | 
 
 ### Return type
 

samples/client/petstore/dart-jaguar/openapi/lib/api/pet_api.dart

@@ -24,12 +24,12 @@ class PetApi extends _$PetApiClient implements ApiClient {
     @PostReq(path: "/pet", metadata: {"auth": [ {"type": "oauth2", "name": "petstore_auth" }]})
     Future<void> addPet(
             
-              @AsJson() Pet pet
+              @AsJson() Pet body
         ) {
         return super.addPet(
 
         
-        pet
+        body
         ).timeout(timeout);
     }
 
@@ -99,12 +99,12 @@ class PetApi extends _$PetApiClient implements ApiClient {
     @PutReq(path: "/pet", metadata: {"auth": [ {"type": "oauth2", "name": "petstore_auth" }]})
     Future<void> updatePet(
             
-              @AsJson() Pet pet
+              @AsJson() Pet body
         ) {
         return super.updatePet(
 
         
-        pet
+        body
         ).timeout(timeout);
     }
 

samples/client/petstore/dart-jaguar/openapi/lib/api/store_api.dart

@@ -60,12 +60,12 @@ class StoreApi extends _$StoreApiClient implements ApiClient {
     @PostReq(path: "/store/order")
     Future<Order> placeOrder(
             
-              @AsJson() Order order
+              @AsJson() Order body
         ) {
         return super.placeOrder(
 
         
-        order
+        body
         ).timeout(timeout);
     }
 

samples/client/petstore/dart-jaguar/openapi/lib/api/user_api.dart

@@ -23,12 +23,12 @@ class UserApi extends _$UserApiClient implements ApiClient {
     @PostReq(path: "/user")
     Future<void> createUser(
             
-              @AsJson() User user
+              @AsJson() User body
         ) {
         return super.createUser(
 
         
-        user
+        body
         ).timeout(timeout);
     }
 
@@ -38,12 +38,12 @@ class UserApi extends _$UserApiClient implements ApiClient {
     @PostReq(path: "/user/createWithArray")
     Future<void> createUsersWithArrayInput(
             
-              @AsJson() List<User> user
+              @AsJson() List<User> body
         ) {
         return super.createUsersWithArrayInput(
 
         
-        user
+        body
         ).timeout(timeout);
     }
 
@@ -53,12 +53,12 @@ class UserApi extends _$UserApiClient implements ApiClient {
     @PostReq(path: "/user/createWithList")
     Future<void> createUsersWithListInput(
             
-              @AsJson() List<User> user
+              @AsJson() List<User> body
         ) {
         return super.createUsersWithListInput(
 
         
-        user
+        body
         ).timeout(timeout);
     }
 
@@ -125,13 +125,13 @@ class UserApi extends _$UserApiClient implements ApiClient {
     Future<void> updateUser(
             @PathParam("username") String username
             ,
-              @AsJson() User user
+              @AsJson() User body
         ) {
         return super.updateUser(
         username
 
         ,
-        user
+        body
         ).timeout(timeout);
     }
 

samples/client/petstore/dart-jaguar/openapi/lib/auth/auth.dart

@@ -3,21 +3,21 @@ import 'dart:async';
 import 'package:jaguar_retrofit/jaguar_retrofit.dart';
 
 abstract class AuthInterceptor extends Interceptor {
-  /*
+    /*
      * Get auth information on given route for the given type
      * Can return null if type is not present on auth data or if route doesn't need authentication
      */
-  List<Map<String, dynamic>> getAuthInfo(RouteBase route, String type) {
-    if (route.metadataMap.containsKey("auth")) {
-      final auth = route.metadataMap["auth"];
-      List<Map<String, dynamic>> results = [];
-      for (var info in auth) {
-        if (info["type"] == type) {
-          results.add(info);
+    List<Map<String, dynamic>> getAuthInfo(RouteBase route, String type) {
+        if (route.metadataMap.containsKey("auth")) {
+            final auth = route.metadataMap["auth"];
+            List<Map<String, dynamic>> results = [];
+            for (var info in auth) {
+                if(info["type"] == type) {
+                    results.add(info);
+                }
+            }
+            return results;
         }
-      }
-      return results;
+        return [];
     }
-    return [];
-  }
-}
+}

samples/client/petstore/dart/flutter_petstore/openapi/lib/api/pet_api.dart

@@ -50,7 +50,7 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -100,7 +100,7 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -150,9 +150,9 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return (apiClient.deserialize(response.body, 'List<Pet>') as List).map((item) => item as Pet).toList();
+      return (apiClient.deserialize(_decodeBodyBytes(response), 'List<Pet>') as List).map((item) => item as Pet).toList();
     } else {
       return null;
     }
@@ -201,9 +201,9 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return (apiClient.deserialize(response.body, 'List<Pet>') as List).map((item) => item as Pet).toList();
+      return (apiClient.deserialize(_decodeBodyBytes(response), 'List<Pet>') as List).map((item) => item as Pet).toList();
     } else {
       return null;
     }
@@ -251,9 +251,9 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return apiClient.deserialize(response.body, 'Pet') as Pet;
+      return apiClient.deserialize(_decodeBodyBytes(response), 'Pet') as Pet;
     } else {
       return null;
     }
@@ -301,7 +301,7 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -362,7 +362,7 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -422,9 +422,9 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return apiClient.deserialize(response.body, 'ApiResponse') as ApiResponse;
+      return apiClient.deserialize(_decodeBodyBytes(response), 'ApiResponse') as ApiResponse;
     } else {
       return null;
     }

samples/client/petstore/dart/flutter_petstore/openapi/lib/api/store_api.dart

@@ -50,7 +50,7 @@ class StoreApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -96,9 +96,9 @@ class StoreApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return new Map<String, int>.from(apiClient.deserialize(response.body, 'Map<String, int>'));
+      return new Map<String, int>.from(apiClient.deserialize(_decodeBodyBytes(response), 'Map<String, int>'));
           ;
     } else {
       return null;
@@ -147,9 +147,9 @@ class StoreApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return apiClient.deserialize(response.body, 'Order') as Order;
+      return apiClient.deserialize(_decodeBodyBytes(response), 'Order') as Order;
     } else {
       return null;
     }
@@ -197,9 +197,9 @@ class StoreApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return apiClient.deserialize(response.body, 'Order') as Order;
+      return apiClient.deserialize(_decodeBodyBytes(response), 'Order') as Order;
     } else {
       return null;
     }

samples/client/petstore/dart/flutter_petstore/openapi/lib/api/user_api.dart

@@ -50,7 +50,7 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -99,7 +99,7 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -148,7 +148,7 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -197,7 +197,7 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -246,9 +246,9 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return apiClient.deserialize(response.body, 'User') as User;
+      return apiClient.deserialize(_decodeBodyBytes(response), 'User') as User;
     } else {
       return null;
     }
@@ -301,9 +301,9 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return apiClient.deserialize(response.body, 'String') as String;
+      return apiClient.deserialize(_decodeBodyBytes(response), 'String') as String;
     } else {
       return null;
     }
@@ -348,7 +348,7 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -400,7 +400,7 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;

samples/client/petstore/dart/flutter_petstore/openapi/lib/api_helper.dart

@@ -42,3 +42,15 @@ String parameterToString(dynamic value) {
     return value.toString();
   }
 }
+
+/// Returns the decoded body by utf-8 if application/json with the given headers.
+/// Else, returns the decoded body by default algorithm of dart:http.
+/// Because avoid to text garbling when header only contains "application/json" without "; charset=utf-8".
+String _decodeBodyBytes(Response response) {
+  var contentType = response.headers['content-type'];
+  if (contentType != null && contentType.contains("application/json")) {
+    return utf8.decode(response.bodyBytes);
+  } else {
+    return response.body;
+  }
+}

samples/client/petstore/dart/flutter_petstore/swagger/.gitignore

@@ -0,0 +1,27 @@
+# See https://www.dartlang.org/tools/private-files.html
+
+# Files and directories created by pub
+.buildlog
+.packages
+.project
+.pub/
+build/
+**/packages/
+
+# Files created by dart2js
+# (Most Dart developers will use pub build to compile Dart, use/modify these 
+#  rules if you intend to use dart2js directly
+#  Convention is to use extension '.dart.js' for Dart compiled to Javascript to
+#  differentiate from explicit Javascript files)
+*.dart.js
+*.part.js
+*.js.deps
+*.js.map
+*.info.json
+
+# Directory created by dartdoc
+doc/api/
+
+# Don't commit pubspec lock file 
+# (Library packages only! Remove pattern if developing an application package)
+pubspec.lock

samples/client/petstore/dart/flutter_petstore/swagger/.openapi-generator-ignore

@@ -0,0 +1,23 @@
+# OpenAPI Generator Ignore
+# Generated by openapi-generator https://github.com/openapitools/openapi-generator
+
+# Use this file to prevent files from being overwritten by the generator.
+# The patterns follow closely to .gitignore or .dockerignore.
+
+# As an example, the C# client generator defines ApiClient.cs.
+# You can make changes and tell OpenAPI Generator to ignore just this file by uncommenting the following line:
+#ApiClient.cs
+
+# You can match any string of characters against a directory, file or extension with a single asterisk (*):
+#foo/*/qux
+# The above matches foo/bar/qux and foo/baz/qux, but not foo/bar/baz/qux
+
+# You can recursively match patterns against a directory, file or extension with a double asterisk (**):
+#foo/**/qux
+# This matches foo/bar/qux, foo/baz/qux, and foo/bar/baz/qux
+
+# You can also negate patterns with an exclamation (!).
+# For example, you can ignore all files in a docs folder with the file extension .md:
+#docs/*.md
+# Then explicitly reverse the ignore rule for a single file:
+#!docs/README.md

samples/client/petstore/dart/flutter_petstore/swagger/.openapi-generator/VERSION

@@ -0,0 +1 @@
+4.0.0-SNAPSHOT

samples/client/petstore/dart/flutter_petstore/swagger/README.md

@@ -0,0 +1,121 @@
+# openapi
+This is a sample server Petstore server. For this sample, you can use the api key `special-key` to test the authorization filters.
+
+This Dart package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project:
+
+- API version: 1.0.0
+- Build package: org.openapitools.codegen.languages.DartClientCodegen
+
+## Requirements
+
+Dart 1.20.0 or later OR Flutter 0.0.20 or later
+
+## Installation & Usage
+
+### Github
+If this Dart package is published to Github, please include the following in pubspec.yaml
+```
+name: openapi
+version: 1.0.0
+description: OpenAPI API client
+dependencies:
+  openapi:
+    git: https://github.com/GIT_USER_ID/GIT_REPO_ID.git
+      version: 'any'
+```
+
+### Local
+To use the package in your local drive, please include the following in pubspec.yaml
+```
+dependencies:
+  openapi:
+    path: /path/to/openapi
+```
+
+## Tests
+
+TODO
+
+## Getting Started
+
+Please follow the [installation procedure](#installation--usage) and then run the following:
+
+```dart
+import 'package:openapi/api.dart';
+
+// TODO Configure OAuth2 access token for authorization: petstore_auth
+//openapi.api.Configuration.accessToken = 'YOUR_ACCESS_TOKEN';
+
+var api_instance = new PetApi();
+var body = new Pet(); // Pet | Pet object that needs to be added to the store
+
+try {
+    api_instance.addPet(body);
+} catch (e) {
+    print("Exception when calling PetApi->addPet: $e\n");
+}
+
+```
+
+## Documentation for API Endpoints
+
+All URIs are relative to *http://petstore.swagger.io/v2*
+
+Class | Method | HTTP request | Description
+------------ | ------------- | ------------- | -------------
+*PetApi* | [**addPet**](docs//PetApi.md#addpet) | **POST** /pet | Add a new pet to the store
+*PetApi* | [**deletePet**](docs//PetApi.md#deletepet) | **DELETE** /pet/{petId} | Deletes a pet
+*PetApi* | [**findPetsByStatus**](docs//PetApi.md#findpetsbystatus) | **GET** /pet/findByStatus | Finds Pets by status
+*PetApi* | [**findPetsByTags**](docs//PetApi.md#findpetsbytags) | **GET** /pet/findByTags | Finds Pets by tags
+*PetApi* | [**getPetById**](docs//PetApi.md#getpetbyid) | **GET** /pet/{petId} | Find pet by ID
+*PetApi* | [**updatePet**](docs//PetApi.md#updatepet) | **PUT** /pet | Update an existing pet
+*PetApi* | [**updatePetWithForm**](docs//PetApi.md#updatepetwithform) | **POST** /pet/{petId} | Updates a pet in the store with form data
+*PetApi* | [**uploadFile**](docs//PetApi.md#uploadfile) | **POST** /pet/{petId}/uploadImage | uploads an image
+*StoreApi* | [**deleteOrder**](docs//StoreApi.md#deleteorder) | **DELETE** /store/order/{orderId} | Delete purchase order by ID
+*StoreApi* | [**getInventory**](docs//StoreApi.md#getinventory) | **GET** /store/inventory | Returns pet inventories by status
+*StoreApi* | [**getOrderById**](docs//StoreApi.md#getorderbyid) | **GET** /store/order/{orderId} | Find purchase order by ID
+*StoreApi* | [**placeOrder**](docs//StoreApi.md#placeorder) | **POST** /store/order | Place an order for a pet
+*UserApi* | [**createUser**](docs//UserApi.md#createuser) | **POST** /user | Create user
+*UserApi* | [**createUsersWithArrayInput**](docs//UserApi.md#createuserswitharrayinput) | **POST** /user/createWithArray | Creates list of users with given input array
+*UserApi* | [**createUsersWithListInput**](docs//UserApi.md#createuserswithlistinput) | **POST** /user/createWithList | Creates list of users with given input array
+*UserApi* | [**deleteUser**](docs//UserApi.md#deleteuser) | **DELETE** /user/{username} | Delete user
+*UserApi* | [**getUserByName**](docs//UserApi.md#getuserbyname) | **GET** /user/{username} | Get user by user name
+*UserApi* | [**loginUser**](docs//UserApi.md#loginuser) | **GET** /user/login | Logs user into the system
+*UserApi* | [**logoutUser**](docs//UserApi.md#logoutuser) | **GET** /user/logout | Logs out current logged in user session
+*UserApi* | [**updateUser**](docs//UserApi.md#updateuser) | **PUT** /user/{username} | Updated user
+
+
+## Documentation For Models
+
+ - [ApiResponse](docs//ApiResponse.md)
+ - [Category](docs//Category.md)
+ - [Order](docs//Order.md)
+ - [Pet](docs//Pet.md)
+ - [Tag](docs//Tag.md)
+ - [User](docs//User.md)
+
+
+## Documentation For Authorization
+
+
+## api_key
+
+- **Type**: API key
+- **API key parameter name**: api_key
+- **Location**: HTTP header
+
+## petstore_auth
+
+- **Type**: OAuth
+- **Flow**: implicit
+- **Authorization URL**: http://petstore.swagger.io/api/oauth/dialog
+- **Scopes**: 
+ - **write:pets**: modify pets in your account
+ - **read:pets**: read your pets
+
+
+## Author
+
+
+
+

samples/client/petstore/dart/flutter_petstore/swagger/docs/ApiResponse.md

@@ -0,0 +1,17 @@
+# openapi.model.ApiResponse
+
+## Load the model package
+```dart
+import 'package:openapi/api.dart';
+```
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**code** | **int** |  | [optional] [default to null]
+**type** | **String** |  | [optional] [default to null]
+**message** | **String** |  | [optional] [default to null]
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+

samples/client/petstore/dart/flutter_petstore/swagger/docs/Category.md

@@ -0,0 +1,16 @@
+# openapi.model.Category
+
+## Load the model package
+```dart
+import 'package:openapi/api.dart';
+```
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **int** |  | [optional] [default to null]
+**name** | **String** |  | [optional] [default to null]
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+

samples/client/petstore/dart/flutter_petstore/swagger/docs/Order.md

@@ -0,0 +1,20 @@
+# openapi.model.Order
+
+## Load the model package
+```dart
+import 'package:openapi/api.dart';
+```
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **int** |  | [optional] [default to null]
+**petId** | **int** |  | [optional] [default to null]
+**quantity** | **int** |  | [optional] [default to null]
+**shipDate** | [**DateTime**](DateTime.md) |  | [optional] [default to null]
+**status** | **String** | Order Status | [optional] [default to null]
+**complete** | **bool** |  | [optional] [default to false]
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+

samples/client/petstore/dart/flutter_petstore/swagger/docs/Pet.md

@@ -0,0 +1,20 @@
+# openapi.model.Pet
+
+## Load the model package
+```dart
+import 'package:openapi/api.dart';
+```
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **int** |  | [optional] [default to null]
+**category** | [**Category**](Category.md) |  | [optional] [default to null]
+**name** | **String** |  | [default to null]
+**photoUrls** | **List<String>** |  | [default to []]
+**tags** | [**List<Tag>**](Tag.md) |  | [optional] [default to []]
+**status** | **String** | pet status in the store | [optional] [default to null]
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+

samples/client/petstore/dart/flutter_petstore/swagger/docs/PetApi.md

@@ -0,0 +1,379 @@
+# openapi.api.PetApi
+
+## Load the API package
+```dart
+import 'package:openapi/api.dart';
+```
+
+All URIs are relative to *http://petstore.swagger.io/v2*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**addPet**](PetApi.md#addPet) | **POST** /pet | Add a new pet to the store
+[**deletePet**](PetApi.md#deletePet) | **DELETE** /pet/{petId} | Deletes a pet
+[**findPetsByStatus**](PetApi.md#findPetsByStatus) | **GET** /pet/findByStatus | Finds Pets by status
+[**findPetsByTags**](PetApi.md#findPetsByTags) | **GET** /pet/findByTags | Finds Pets by tags
+[**getPetById**](PetApi.md#getPetById) | **GET** /pet/{petId} | Find pet by ID
+[**updatePet**](PetApi.md#updatePet) | **PUT** /pet | Update an existing pet
+[**updatePetWithForm**](PetApi.md#updatePetWithForm) | **POST** /pet/{petId} | Updates a pet in the store with form data
+[**uploadFile**](PetApi.md#uploadFile) | **POST** /pet/{petId}/uploadImage | uploads an image
+
+
+# **addPet**
+> addPet(body)
+
+Add a new pet to the store
+
+### Example 
+```dart
+import 'package:openapi/api.dart';
+// TODO Configure OAuth2 access token for authorization: petstore_auth
+//openapi.api.Configuration.accessToken = 'YOUR_ACCESS_TOKEN';
+
+var api_instance = new PetApi();
+var body = new Pet(); // Pet | Pet object that needs to be added to the store
+
+try { 
+    api_instance.addPet(body);
+} catch (e) {
+    print("Exception when calling PetApi->addPet: $e\n");
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, application/xml
+ - **Accept**: Not defined
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **deletePet**
+> deletePet(petId, apiKey)
+
+Deletes a pet
+
+### Example 
+```dart
+import 'package:openapi/api.dart';
+// TODO Configure OAuth2 access token for authorization: petstore_auth
+//openapi.api.Configuration.accessToken = 'YOUR_ACCESS_TOKEN';
+
+var api_instance = new PetApi();
+var petId = 789; // int | Pet id to delete
+var apiKey = apiKey_example; // String | 
+
+try { 
+    api_instance.deletePet(petId, apiKey);
+} catch (e) {
+    print("Exception when calling PetApi->deletePet: $e\n");
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **int**| Pet id to delete | [default to null]
+ **apiKey** | **String**|  | [optional] [default to null]
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: Not defined
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **findPetsByStatus**
+> List<Pet> findPetsByStatus(status)
+
+Finds Pets by status
+
+Multiple status values can be provided with comma separated strings
+
+### Example 
+```dart
+import 'package:openapi/api.dart';
+// TODO Configure OAuth2 access token for authorization: petstore_auth
+//openapi.api.Configuration.accessToken = 'YOUR_ACCESS_TOKEN';
+
+var api_instance = new PetApi();
+var status = []; // List<String> | Status values that need to be considered for filter
+
+try { 
+    var result = api_instance.findPetsByStatus(status);
+    print(result);
+} catch (e) {
+    print("Exception when calling PetApi->findPetsByStatus: $e\n");
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **status** | [**List&lt;String&gt;**](String.md)| Status values that need to be considered for filter | [default to []]
+
+### Return type
+
+[**List<Pet>**](Pet.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **findPetsByTags**
+> List<Pet> findPetsByTags(tags)
+
+Finds Pets by tags
+
+Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+
+### Example 
+```dart
+import 'package:openapi/api.dart';
+// TODO Configure OAuth2 access token for authorization: petstore_auth
+//openapi.api.Configuration.accessToken = 'YOUR_ACCESS_TOKEN';
+
+var api_instance = new PetApi();
+var tags = []; // List<String> | Tags to filter by
+
+try { 
+    var result = api_instance.findPetsByTags(tags);
+    print(result);
+} catch (e) {
+    print("Exception when calling PetApi->findPetsByTags: $e\n");
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **tags** | [**List&lt;String&gt;**](String.md)| Tags to filter by | [default to []]
+
+### Return type
+
+[**List<Pet>**](Pet.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **getPetById**
+> Pet getPetById(petId)
+
+Find pet by ID
+
+Returns a single pet
+
+### Example 
+```dart
+import 'package:openapi/api.dart';
+// TODO Configure API key authorization: api_key
+//openapi.api.Configuration.apiKey{'api_key'} = 'YOUR_API_KEY';
+// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+//openapi.api.Configuration.apiKeyPrefix{'api_key'} = "Bearer";
+
+var api_instance = new PetApi();
+var petId = 789; // int | ID of pet to return
+
+try { 
+    var result = api_instance.getPetById(petId);
+    print(result);
+} catch (e) {
+    print("Exception when calling PetApi->getPetById: $e\n");
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **int**| ID of pet to return | [default to null]
+
+### Return type
+
+[**Pet**](Pet.md)
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **updatePet**
+> updatePet(body)
+
+Update an existing pet
+
+### Example 
+```dart
+import 'package:openapi/api.dart';
+// TODO Configure OAuth2 access token for authorization: petstore_auth
+//openapi.api.Configuration.accessToken = 'YOUR_ACCESS_TOKEN';
+
+var api_instance = new PetApi();
+var body = new Pet(); // Pet | Pet object that needs to be added to the store
+
+try { 
+    api_instance.updatePet(body);
+} catch (e) {
+    print("Exception when calling PetApi->updatePet: $e\n");
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**Pet**](Pet.md)| Pet object that needs to be added to the store | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: application/json, application/xml
+ - **Accept**: Not defined
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **updatePetWithForm**
+> updatePetWithForm(petId, name, status)
+
+Updates a pet in the store with form data
+
+### Example 
+```dart
+import 'package:openapi/api.dart';
+// TODO Configure OAuth2 access token for authorization: petstore_auth
+//openapi.api.Configuration.accessToken = 'YOUR_ACCESS_TOKEN';
+
+var api_instance = new PetApi();
+var petId = 789; // int | ID of pet that needs to be updated
+var name = name_example; // String | Updated name of the pet
+var status = status_example; // String | Updated status of the pet
+
+try { 
+    api_instance.updatePetWithForm(petId, name, status);
+} catch (e) {
+    print("Exception when calling PetApi->updatePetWithForm: $e\n");
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **int**| ID of pet that needs to be updated | [default to null]
+ **name** | **String**| Updated name of the pet | [optional] [default to null]
+ **status** | **String**| Updated status of the pet | [optional] [default to null]
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: application/x-www-form-urlencoded
+ - **Accept**: Not defined
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **uploadFile**
+> ApiResponse uploadFile(petId, additionalMetadata, file)
+
+uploads an image
+
+### Example 
+```dart
+import 'package:openapi/api.dart';
+// TODO Configure OAuth2 access token for authorization: petstore_auth
+//openapi.api.Configuration.accessToken = 'YOUR_ACCESS_TOKEN';
+
+var api_instance = new PetApi();
+var petId = 789; // int | ID of pet to update
+var additionalMetadata = additionalMetadata_example; // String | Additional data to pass to server
+var file = BINARY_DATA_HERE; // MultipartFile | file to upload
+
+try { 
+    var result = api_instance.uploadFile(petId, additionalMetadata, file);
+    print(result);
+} catch (e) {
+    print("Exception when calling PetApi->uploadFile: $e\n");
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **petId** | **int**| ID of pet to update | [default to null]
+ **additionalMetadata** | **String**| Additional data to pass to server | [optional] [default to null]
+ **file** | **MultipartFile**| file to upload | [optional] [default to null]
+
+### Return type
+
+[**ApiResponse**](ApiResponse.md)
+
+### Authorization
+
+[petstore_auth](../README.md#petstore_auth)
+
+### HTTP request headers
+
+ - **Content-Type**: multipart/form-data
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+

samples/client/petstore/dart/flutter_petstore/swagger/docs/StoreApi.md

@@ -0,0 +1,186 @@
+# openapi.api.StoreApi
+
+## Load the API package
+```dart
+import 'package:openapi/api.dart';
+```
+
+All URIs are relative to *http://petstore.swagger.io/v2*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**deleteOrder**](StoreApi.md#deleteOrder) | **DELETE** /store/order/{orderId} | Delete purchase order by ID
+[**getInventory**](StoreApi.md#getInventory) | **GET** /store/inventory | Returns pet inventories by status
+[**getOrderById**](StoreApi.md#getOrderById) | **GET** /store/order/{orderId} | Find purchase order by ID
+[**placeOrder**](StoreApi.md#placeOrder) | **POST** /store/order | Place an order for a pet
+
+
+# **deleteOrder**
+> deleteOrder(orderId)
+
+Delete purchase order by ID
+
+For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+
+### Example 
+```dart
+import 'package:openapi/api.dart';
+
+var api_instance = new StoreApi();
+var orderId = orderId_example; // String | ID of the order that needs to be deleted
+
+try { 
+    api_instance.deleteOrder(orderId);
+} catch (e) {
+    print("Exception when calling StoreApi->deleteOrder: $e\n");
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **orderId** | **String**| ID of the order that needs to be deleted | [default to null]
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: Not defined
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **getInventory**
+> Map<String, int> getInventory()
+
+Returns pet inventories by status
+
+Returns a map of status codes to quantities
+
+### Example 
+```dart
+import 'package:openapi/api.dart';
+// TODO Configure API key authorization: api_key
+//openapi.api.Configuration.apiKey{'api_key'} = 'YOUR_API_KEY';
+// uncomment below to setup prefix (e.g. Bearer) for API key, if needed
+//openapi.api.Configuration.apiKeyPrefix{'api_key'} = "Bearer";
+
+var api_instance = new StoreApi();
+
+try { 
+    var result = api_instance.getInventory();
+    print(result);
+} catch (e) {
+    print("Exception when calling StoreApi->getInventory: $e\n");
+}
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+**Map<String, int>**
+
+### Authorization
+
+[api_key](../README.md#api_key)
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **getOrderById**
+> Order getOrderById(orderId)
+
+Find purchase order by ID
+
+For valid response try integer IDs with value <= 5 or > 10. Other values will generated exceptions
+
+### Example 
+```dart
+import 'package:openapi/api.dart';
+
+var api_instance = new StoreApi();
+var orderId = 789; // int | ID of pet that needs to be fetched
+
+try { 
+    var result = api_instance.getOrderById(orderId);
+    print(result);
+} catch (e) {
+    print("Exception when calling StoreApi->getOrderById: $e\n");
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **orderId** | **int**| ID of pet that needs to be fetched | [default to null]
+
+### Return type
+
+[**Order**](Order.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **placeOrder**
+> Order placeOrder(body)
+
+Place an order for a pet
+
+### Example 
+```dart
+import 'package:openapi/api.dart';
+
+var api_instance = new StoreApi();
+var body = new Order(); // Order | order placed for purchasing the pet
+
+try { 
+    var result = api_instance.placeOrder(body);
+    print(result);
+} catch (e) {
+    print("Exception when calling StoreApi->placeOrder: $e\n");
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**Order**](Order.md)| order placed for purchasing the pet | 
+
+### Return type
+
+[**Order**](Order.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+

samples/client/petstore/dart/flutter_petstore/swagger/docs/Tag.md

@@ -0,0 +1,16 @@
+# openapi.model.Tag
+
+## Load the model package
+```dart
+import 'package:openapi/api.dart';
+```
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **int** |  | [optional] [default to null]
+**name** | **String** |  | [optional] [default to null]
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+

samples/client/petstore/dart/flutter_petstore/swagger/docs/User.md

@@ -0,0 +1,22 @@
+# openapi.model.User
+
+## Load the model package
+```dart
+import 'package:openapi/api.dart';
+```
+
+## Properties
+Name | Type | Description | Notes
+------------ | ------------- | ------------- | -------------
+**id** | **int** |  | [optional] [default to null]
+**username** | **String** |  | [optional] [default to null]
+**firstName** | **String** |  | [optional] [default to null]
+**lastName** | **String** |  | [optional] [default to null]
+**email** | **String** |  | [optional] [default to null]
+**password** | **String** |  | [optional] [default to null]
+**phone** | **String** |  | [optional] [default to null]
+**userStatus** | **int** | User Status | [optional] [default to null]
+
+[[Back to Model list]](../README.md#documentation-for-models) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to README]](../README.md)
+
+

samples/client/petstore/dart/flutter_petstore/swagger/docs/UserApi.md

@@ -0,0 +1,349 @@
+# openapi.api.UserApi
+
+## Load the API package
+```dart
+import 'package:openapi/api.dart';
+```
+
+All URIs are relative to *http://petstore.swagger.io/v2*
+
+Method | HTTP request | Description
+------------- | ------------- | -------------
+[**createUser**](UserApi.md#createUser) | **POST** /user | Create user
+[**createUsersWithArrayInput**](UserApi.md#createUsersWithArrayInput) | **POST** /user/createWithArray | Creates list of users with given input array
+[**createUsersWithListInput**](UserApi.md#createUsersWithListInput) | **POST** /user/createWithList | Creates list of users with given input array
+[**deleteUser**](UserApi.md#deleteUser) | **DELETE** /user/{username} | Delete user
+[**getUserByName**](UserApi.md#getUserByName) | **GET** /user/{username} | Get user by user name
+[**loginUser**](UserApi.md#loginUser) | **GET** /user/login | Logs user into the system
+[**logoutUser**](UserApi.md#logoutUser) | **GET** /user/logout | Logs out current logged in user session
+[**updateUser**](UserApi.md#updateUser) | **PUT** /user/{username} | Updated user
+
+
+# **createUser**
+> createUser(body)
+
+Create user
+
+This can only be done by the logged in user.
+
+### Example 
+```dart
+import 'package:openapi/api.dart';
+
+var api_instance = new UserApi();
+var body = new User(); // User | Created user object
+
+try { 
+    api_instance.createUser(body);
+} catch (e) {
+    print("Exception when calling UserApi->createUser: $e\n");
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**User**](User.md)| Created user object | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: Not defined
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **createUsersWithArrayInput**
+> createUsersWithArrayInput(body)
+
+Creates list of users with given input array
+
+### Example 
+```dart
+import 'package:openapi/api.dart';
+
+var api_instance = new UserApi();
+var body = [new List&lt;User&gt;()]; // List<User> | List of user object
+
+try { 
+    api_instance.createUsersWithArrayInput(body);
+} catch (e) {
+    print("Exception when calling UserApi->createUsersWithArrayInput: $e\n");
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**List&lt;User&gt;**](List.md)| List of user object | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: Not defined
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **createUsersWithListInput**
+> createUsersWithListInput(body)
+
+Creates list of users with given input array
+
+### Example 
+```dart
+import 'package:openapi/api.dart';
+
+var api_instance = new UserApi();
+var body = [new List&lt;User&gt;()]; // List<User> | List of user object
+
+try { 
+    api_instance.createUsersWithListInput(body);
+} catch (e) {
+    print("Exception when calling UserApi->createUsersWithListInput: $e\n");
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **body** | [**List&lt;User&gt;**](List.md)| List of user object | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: Not defined
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **deleteUser**
+> deleteUser(username)
+
+Delete user
+
+This can only be done by the logged in user.
+
+### Example 
+```dart
+import 'package:openapi/api.dart';
+
+var api_instance = new UserApi();
+var username = username_example; // String | The name that needs to be deleted
+
+try { 
+    api_instance.deleteUser(username);
+} catch (e) {
+    print("Exception when calling UserApi->deleteUser: $e\n");
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **String**| The name that needs to be deleted | [default to null]
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: Not defined
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **getUserByName**
+> User getUserByName(username)
+
+Get user by user name
+
+### Example 
+```dart
+import 'package:openapi/api.dart';
+
+var api_instance = new UserApi();
+var username = username_example; // String | The name that needs to be fetched. Use user1 for testing.
+
+try { 
+    var result = api_instance.getUserByName(username);
+    print(result);
+} catch (e) {
+    print("Exception when calling UserApi->getUserByName: $e\n");
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **String**| The name that needs to be fetched. Use user1 for testing. | [default to null]
+
+### Return type
+
+[**User**](User.md)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **loginUser**
+> String loginUser(username, password)
+
+Logs user into the system
+
+### Example 
+```dart
+import 'package:openapi/api.dart';
+
+var api_instance = new UserApi();
+var username = username_example; // String | The user name for login
+var password = password_example; // String | The password for login in clear text
+
+try { 
+    var result = api_instance.loginUser(username, password);
+    print(result);
+} catch (e) {
+    print("Exception when calling UserApi->loginUser: $e\n");
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **String**| The user name for login | [default to null]
+ **password** | **String**| The password for login in clear text | [default to null]
+
+### Return type
+
+**String**
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: application/xml, application/json
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **logoutUser**
+> logoutUser()
+
+Logs out current logged in user session
+
+### Example 
+```dart
+import 'package:openapi/api.dart';
+
+var api_instance = new UserApi();
+
+try { 
+    api_instance.logoutUser();
+} catch (e) {
+    print("Exception when calling UserApi->logoutUser: $e\n");
+}
+```
+
+### Parameters
+This endpoint does not need any parameter.
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: Not defined
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+
+# **updateUser**
+> updateUser(username, body)
+
+Updated user
+
+This can only be done by the logged in user.
+
+### Example 
+```dart
+import 'package:openapi/api.dart';
+
+var api_instance = new UserApi();
+var username = username_example; // String | name that need to be deleted
+var body = new User(); // User | Updated user object
+
+try { 
+    api_instance.updateUser(username, body);
+} catch (e) {
+    print("Exception when calling UserApi->updateUser: $e\n");
+}
+```
+
+### Parameters
+
+Name | Type | Description  | Notes
+------------- | ------------- | ------------- | -------------
+ **username** | **String**| name that need to be deleted | [default to null]
+ **body** | [**User**](User.md)| Updated user object | 
+
+### Return type
+
+void (empty response body)
+
+### Authorization
+
+No authorization required
+
+### HTTP request headers
+
+ - **Content-Type**: Not defined
+ - **Accept**: Not defined
+
+[[Back to top]](#) [[Back to API list]](../README.md#documentation-for-api-endpoints) [[Back to Model list]](../README.md#documentation-for-models) [[Back to README]](../README.md)
+

samples/client/petstore/dart/flutter_petstore/swagger/git_push.sh

@@ -0,0 +1,52 @@
+#!/bin/sh
+# ref: https://help.github.com/articles/adding-an-existing-project-to-github-using-the-command-line/
+#
+# Usage example: /bin/sh ./git_push.sh wing328 openapi-pestore-perl "minor update"
+
+git_user_id=$1
+git_repo_id=$2
+release_note=$3
+
+if [ "$git_user_id" = "" ]; then
+    git_user_id="GIT_USER_ID"
+    echo "[INFO] No command line input provided. Set \$git_user_id to $git_user_id"
+fi
+
+if [ "$git_repo_id" = "" ]; then
+    git_repo_id="GIT_REPO_ID"
+    echo "[INFO] No command line input provided. Set \$git_repo_id to $git_repo_id"
+fi
+
+if [ "$release_note" = "" ]; then
+    release_note="Minor update"
+    echo "[INFO] No command line input provided. Set \$release_note to $release_note"
+fi
+
+# Initialize the local directory as a Git repository
+git init
+
+# Adds the files in the local repository and stages them for commit.
+git add .
+
+# Commits the tracked changes and prepares them to be pushed to a remote repository. 
+git commit -m "$release_note"
+
+# Sets the new remote
+git_remote=`git remote`
+if [ "$git_remote" = "" ]; then # git remote not defined
+
+    if [ "$GIT_TOKEN" = "" ]; then
+        echo "[INFO] \$GIT_TOKEN (environment variable) is not set. Using the git credential in your environment."
+        git remote add origin https://github.com/${git_user_id}/${git_repo_id}.git
+    else
+        git remote add origin https://${git_user_id}:${GIT_TOKEN}@github.com/${git_user_id}/${git_repo_id}.git
+    fi
+
+fi
+
+git pull origin master
+
+# Pushes (Forces) the changes in the local repository up to the remote repository
+echo "Git pushing to https://github.com/${git_user_id}/${git_repo_id}.git"
+git push origin master 2>&1 | grep -v 'To https'
+

samples/client/petstore/dart/flutter_petstore/swagger/lib/api.dart

@@ -0,0 +1,27 @@
+library openapi.api;
+
+import 'dart:async';
+import 'dart:convert';
+import 'package:http/http.dart';
+
+part 'api_client.dart';
+part 'api_helper.dart';
+part 'api_exception.dart';
+part 'auth/authentication.dart';
+part 'auth/api_key_auth.dart';
+part 'auth/oauth.dart';
+part 'auth/http_basic_auth.dart';
+
+part 'api/pet_api.dart';
+part 'api/store_api.dart';
+part 'api/user_api.dart';
+
+part 'model/api_response.dart';
+part 'model/category.dart';
+part 'model/order.dart';
+part 'model/pet.dart';
+part 'model/tag.dart';
+part 'model/user.dart';
+
+
+ApiClient defaultApiClient = ApiClient();

samples/client/petstore/dart/flutter_petstore/swagger/lib/api/pet_api.dart

@@ -0,0 +1,432 @@
+part of openapi.api;
+
+
+
+class PetApi {
+  final ApiClient apiClient;
+
+  PetApi([ApiClient apiClient]) : apiClient = apiClient ?? defaultApiClient;
+
+  /// Add a new pet to the store
+  ///
+  /// 
+  Future addPet(Pet body) async {
+    Object postBody = body;
+
+    // verify required params are set
+    if(body == null) {
+     throw new ApiException(400, "Missing required param: body");
+    }
+
+    // create path and map variables
+    String path = "/pet".replaceAll("{format}","json");
+
+    // query params
+    List<QueryParam> queryParams = [];
+    Map<String, String> headerParams = {};
+    Map<String, String> formParams = {};
+
+    List<String> contentTypes = ["application/json","application/xml"];
+
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+    List<String> authNames = ["petstore_auth"];
+
+    if(contentType.startsWith("multipart/form-data")) {
+      bool hasFields = false;
+      MultipartRequest mp = new MultipartRequest(null, null);
+      if(hasFields)
+        postBody = mp;
+    }
+    else {
+    }
+
+    var response = await apiClient.invokeAPI(path,
+                                             'POST',
+                                             queryParams,
+                                             postBody,
+                                             headerParams,
+                                             formParams,
+                                             contentType,
+                                             authNames);
+
+    if(response.statusCode >= 400) {
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
+    } else if(response.body != null) {
+    } else {
+      return;
+    }
+  }
+  /// Deletes a pet
+  ///
+  /// 
+  Future deletePet(int petId, { String apiKey }) async {
+    Object postBody;
+
+    // verify required params are set
+    if(petId == null) {
+     throw new ApiException(400, "Missing required param: petId");
+    }
+
+    // create path and map variables
+    String path = "/pet/{petId}".replaceAll("{format}","json").replaceAll("{" + "petId" + "}", petId.toString());
+
+    // query params
+    List<QueryParam> queryParams = [];
+    Map<String, String> headerParams = {};
+    Map<String, String> formParams = {};
+    headerParams["api_key"] = apiKey;
+
+    List<String> contentTypes = [];
+
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+    List<String> authNames = ["petstore_auth"];
+
+    if(contentType.startsWith("multipart/form-data")) {
+      bool hasFields = false;
+      MultipartRequest mp = new MultipartRequest(null, null);
+      if(hasFields)
+        postBody = mp;
+    }
+    else {
+    }
+
+    var response = await apiClient.invokeAPI(path,
+                                             'DELETE',
+                                             queryParams,
+                                             postBody,
+                                             headerParams,
+                                             formParams,
+                                             contentType,
+                                             authNames);
+
+    if(response.statusCode >= 400) {
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
+    } else if(response.body != null) {
+    } else {
+      return;
+    }
+  }
+  /// Finds Pets by status
+  ///
+  /// Multiple status values can be provided with comma separated strings
+  Future<List<Pet>> findPetsByStatus(List<String> status) async {
+    Object postBody;
+
+    // verify required params are set
+    if(status == null) {
+     throw new ApiException(400, "Missing required param: status");
+    }
+
+    // create path and map variables
+    String path = "/pet/findByStatus".replaceAll("{format}","json");
+
+    // query params
+    List<QueryParam> queryParams = [];
+    Map<String, String> headerParams = {};
+    Map<String, String> formParams = {};
+      queryParams.addAll(_convertParametersForCollectionFormat("csv", "status", status));
+
+    List<String> contentTypes = [];
+
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+    List<String> authNames = ["petstore_auth"];
+
+    if(contentType.startsWith("multipart/form-data")) {
+      bool hasFields = false;
+      MultipartRequest mp = new MultipartRequest(null, null);
+      if(hasFields)
+        postBody = mp;
+    }
+    else {
+    }
+
+    var response = await apiClient.invokeAPI(path,
+                                             'GET',
+                                             queryParams,
+                                             postBody,
+                                             headerParams,
+                                             formParams,
+                                             contentType,
+                                             authNames);
+
+    if(response.statusCode >= 400) {
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
+    } else if(response.body != null) {
+      return (apiClient.deserialize(_decodeBodyBytes(response), 'List<Pet>') as List).map((item) => item as Pet).toList();
+    } else {
+      return null;
+    }
+  }
+  /// Finds Pets by tags
+  ///
+  /// Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing.
+  Future<List<Pet>> findPetsByTags(List<String> tags) async {
+    Object postBody;
+
+    // verify required params are set
+    if(tags == null) {
+     throw new ApiException(400, "Missing required param: tags");
+    }
+
+    // create path and map variables
+    String path = "/pet/findByTags".replaceAll("{format}","json");
+
+    // query params
+    List<QueryParam> queryParams = [];
+    Map<String, String> headerParams = {};
+    Map<String, String> formParams = {};
+      queryParams.addAll(_convertParametersForCollectionFormat("csv", "tags", tags));
+
+    List<String> contentTypes = [];
+
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+    List<String> authNames = ["petstore_auth"];
+
+    if(contentType.startsWith("multipart/form-data")) {
+      bool hasFields = false;
+      MultipartRequest mp = new MultipartRequest(null, null);
+      if(hasFields)
+        postBody = mp;
+    }
+    else {
+    }
+
+    var response = await apiClient.invokeAPI(path,
+                                             'GET',
+                                             queryParams,
+                                             postBody,
+                                             headerParams,
+                                             formParams,
+                                             contentType,
+                                             authNames);
+
+    if(response.statusCode >= 400) {
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
+    } else if(response.body != null) {
+      return (apiClient.deserialize(_decodeBodyBytes(response), 'List<Pet>') as List).map((item) => item as Pet).toList();
+    } else {
+      return null;
+    }
+  }
+  /// Find pet by ID
+  ///
+  /// Returns a single pet
+  Future<Pet> getPetById(int petId) async {
+    Object postBody;
+
+    // verify required params are set
+    if(petId == null) {
+     throw new ApiException(400, "Missing required param: petId");
+    }
+
+    // create path and map variables
+    String path = "/pet/{petId}".replaceAll("{format}","json").replaceAll("{" + "petId" + "}", petId.toString());
+
+    // query params
+    List<QueryParam> queryParams = [];
+    Map<String, String> headerParams = {};
+    Map<String, String> formParams = {};
+
+    List<String> contentTypes = [];
+
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+    List<String> authNames = ["api_key"];
+
+    if(contentType.startsWith("multipart/form-data")) {
+      bool hasFields = false;
+      MultipartRequest mp = new MultipartRequest(null, null);
+      if(hasFields)
+        postBody = mp;
+    }
+    else {
+    }
+
+    var response = await apiClient.invokeAPI(path,
+                                             'GET',
+                                             queryParams,
+                                             postBody,
+                                             headerParams,
+                                             formParams,
+                                             contentType,
+                                             authNames);
+
+    if(response.statusCode >= 400) {
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
+    } else if(response.body != null) {
+      return apiClient.deserialize(_decodeBodyBytes(response), 'Pet') as Pet;
+    } else {
+      return null;
+    }
+  }
+  /// Update an existing pet
+  ///
+  /// 
+  Future updatePet(Pet body) async {
+    Object postBody = body;
+
+    // verify required params are set
+    if(body == null) {
+     throw new ApiException(400, "Missing required param: body");
+    }
+
+    // create path and map variables
+    String path = "/pet".replaceAll("{format}","json");
+
+    // query params
+    List<QueryParam> queryParams = [];
+    Map<String, String> headerParams = {};
+    Map<String, String> formParams = {};
+
+    List<String> contentTypes = ["application/json","application/xml"];
+
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+    List<String> authNames = ["petstore_auth"];
+
+    if(contentType.startsWith("multipart/form-data")) {
+      bool hasFields = false;
+      MultipartRequest mp = new MultipartRequest(null, null);
+      if(hasFields)
+        postBody = mp;
+    }
+    else {
+    }
+
+    var response = await apiClient.invokeAPI(path,
+                                             'PUT',
+                                             queryParams,
+                                             postBody,
+                                             headerParams,
+                                             formParams,
+                                             contentType,
+                                             authNames);
+
+    if(response.statusCode >= 400) {
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
+    } else if(response.body != null) {
+    } else {
+      return;
+    }
+  }
+  /// Updates a pet in the store with form data
+  ///
+  /// 
+  Future updatePetWithForm(int petId, { String name, String status }) async {
+    Object postBody;
+
+    // verify required params are set
+    if(petId == null) {
+     throw new ApiException(400, "Missing required param: petId");
+    }
+
+    // create path and map variables
+    String path = "/pet/{petId}".replaceAll("{format}","json").replaceAll("{" + "petId" + "}", petId.toString());
+
+    // query params
+    List<QueryParam> queryParams = [];
+    Map<String, String> headerParams = {};
+    Map<String, String> formParams = {};
+
+    List<String> contentTypes = ["application/x-www-form-urlencoded"];
+
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+    List<String> authNames = ["petstore_auth"];
+
+    if(contentType.startsWith("multipart/form-data")) {
+      bool hasFields = false;
+      MultipartRequest mp = new MultipartRequest(null, null);
+      if (name != null) {
+        hasFields = true;
+        mp.fields['name'] = parameterToString(name);
+      }
+      if (status != null) {
+        hasFields = true;
+        mp.fields['status'] = parameterToString(status);
+      }
+      if(hasFields)
+        postBody = mp;
+    }
+    else {
+      if (name != null)
+        formParams['name'] = parameterToString(name);
+      if (status != null)
+        formParams['status'] = parameterToString(status);
+    }
+
+    var response = await apiClient.invokeAPI(path,
+                                             'POST',
+                                             queryParams,
+                                             postBody,
+                                             headerParams,
+                                             formParams,
+                                             contentType,
+                                             authNames);
+
+    if(response.statusCode >= 400) {
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
+    } else if(response.body != null) {
+    } else {
+      return;
+    }
+  }
+  /// uploads an image
+  ///
+  /// 
+  Future<ApiResponse> uploadFile(int petId, { String additionalMetadata, MultipartFile file }) async {
+    Object postBody;
+
+    // verify required params are set
+    if(petId == null) {
+     throw new ApiException(400, "Missing required param: petId");
+    }
+
+    // create path and map variables
+    String path = "/pet/{petId}/uploadImage".replaceAll("{format}","json").replaceAll("{" + "petId" + "}", petId.toString());
+
+    // query params
+    List<QueryParam> queryParams = [];
+    Map<String, String> headerParams = {};
+    Map<String, String> formParams = {};
+
+    List<String> contentTypes = ["multipart/form-data"];
+
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+    List<String> authNames = ["petstore_auth"];
+
+    if(contentType.startsWith("multipart/form-data")) {
+      bool hasFields = false;
+      MultipartRequest mp = new MultipartRequest(null, null);
+      if (additionalMetadata != null) {
+        hasFields = true;
+        mp.fields['additionalMetadata'] = parameterToString(additionalMetadata);
+      }
+      if (file != null) {
+        hasFields = true;
+        mp.fields['file'] = file.field;
+        mp.files.add(file);
+      }
+      if(hasFields)
+        postBody = mp;
+    }
+    else {
+      if (additionalMetadata != null)
+        formParams['additionalMetadata'] = parameterToString(additionalMetadata);
+    }
+
+    var response = await apiClient.invokeAPI(path,
+                                             'POST',
+                                             queryParams,
+                                             postBody,
+                                             headerParams,
+                                             formParams,
+                                             contentType,
+                                             authNames);
+
+    if(response.statusCode >= 400) {
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
+    } else if(response.body != null) {
+      return apiClient.deserialize(_decodeBodyBytes(response), 'ApiResponse') as ApiResponse;
+    } else {
+      return null;
+    }
+  }
+}

samples/client/petstore/dart/flutter_petstore/swagger/lib/api/store_api.dart

@@ -0,0 +1,207 @@
+part of openapi.api;
+
+
+
+class StoreApi {
+  final ApiClient apiClient;
+
+  StoreApi([ApiClient apiClient]) : apiClient = apiClient ?? defaultApiClient;
+
+  /// Delete purchase order by ID
+  ///
+  /// For valid response try integer IDs with value < 1000. Anything above 1000 or nonintegers will generate API errors
+  Future deleteOrder(String orderId) async {
+    Object postBody;
+
+    // verify required params are set
+    if(orderId == null) {
+     throw new ApiException(400, "Missing required param: orderId");
+    }
+
+    // create path and map variables
+    String path = "/store/order/{orderId}".replaceAll("{format}","json").replaceAll("{" + "orderId" + "}", orderId.toString());
+
+    // query params
+    List<QueryParam> queryParams = [];
+    Map<String, String> headerParams = {};
+    Map<String, String> formParams = {};
+
+    List<String> contentTypes = [];
+
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+    List<String> authNames = [];
+
+    if(contentType.startsWith("multipart/form-data")) {
+      bool hasFields = false;
+      MultipartRequest mp = new MultipartRequest(null, null);
+      if(hasFields)
+        postBody = mp;
+    }
+    else {
+    }
+
+    var response = await apiClient.invokeAPI(path,
+                                             'DELETE',
+                                             queryParams,
+                                             postBody,
+                                             headerParams,
+                                             formParams,
+                                             contentType,
+                                             authNames);
+
+    if(response.statusCode >= 400) {
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
+    } else if(response.body != null) {
+    } else {
+      return;
+    }
+  }
+  /// Returns pet inventories by status
+  ///
+  /// Returns a map of status codes to quantities
+  Future<Map<String, int>> getInventory() async {
+    Object postBody;
+
+    // verify required params are set
+
+    // create path and map variables
+    String path = "/store/inventory".replaceAll("{format}","json");
+
+    // query params
+    List<QueryParam> queryParams = [];
+    Map<String, String> headerParams = {};
+    Map<String, String> formParams = {};
+
+    List<String> contentTypes = [];
+
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+    List<String> authNames = ["api_key"];
+
+    if(contentType.startsWith("multipart/form-data")) {
+      bool hasFields = false;
+      MultipartRequest mp = new MultipartRequest(null, null);
+      if(hasFields)
+        postBody = mp;
+    }
+    else {
+    }
+
+    var response = await apiClient.invokeAPI(path,
+                                             'GET',
+                                             queryParams,
+                                             postBody,
+                                             headerParams,
+                                             formParams,
+                                             contentType,
+                                             authNames);
+
+    if(response.statusCode >= 400) {
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
+    } else if(response.body != null) {
+      return new Map<String, int>.from(apiClient.deserialize(_decodeBodyBytes(response), 'Map<String, int>'));
+          ;
+    } else {
+      return null;
+    }
+  }
+  /// Find purchase order by ID
+  ///
+  /// For valid response try integer IDs with value &lt;&#x3D; 5 or &gt; 10. Other values will generated exceptions
+  Future<Order> getOrderById(int orderId) async {
+    Object postBody;
+
+    // verify required params are set
+    if(orderId == null) {
+     throw new ApiException(400, "Missing required param: orderId");
+    }
+
+    // create path and map variables
+    String path = "/store/order/{orderId}".replaceAll("{format}","json").replaceAll("{" + "orderId" + "}", orderId.toString());
+
+    // query params
+    List<QueryParam> queryParams = [];
+    Map<String, String> headerParams = {};
+    Map<String, String> formParams = {};
+
+    List<String> contentTypes = [];
+
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+    List<String> authNames = [];
+
+    if(contentType.startsWith("multipart/form-data")) {
+      bool hasFields = false;
+      MultipartRequest mp = new MultipartRequest(null, null);
+      if(hasFields)
+        postBody = mp;
+    }
+    else {
+    }
+
+    var response = await apiClient.invokeAPI(path,
+                                             'GET',
+                                             queryParams,
+                                             postBody,
+                                             headerParams,
+                                             formParams,
+                                             contentType,
+                                             authNames);
+
+    if(response.statusCode >= 400) {
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
+    } else if(response.body != null) {
+      return apiClient.deserialize(_decodeBodyBytes(response), 'Order') as Order;
+    } else {
+      return null;
+    }
+  }
+  /// Place an order for a pet
+  ///
+  /// 
+  Future<Order> placeOrder(Order body) async {
+    Object postBody = body;
+
+    // verify required params are set
+    if(body == null) {
+     throw new ApiException(400, "Missing required param: body");
+    }
+
+    // create path and map variables
+    String path = "/store/order".replaceAll("{format}","json");
+
+    // query params
+    List<QueryParam> queryParams = [];
+    Map<String, String> headerParams = {};
+    Map<String, String> formParams = {};
+
+    List<String> contentTypes = [];
+
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+    List<String> authNames = [];
+
+    if(contentType.startsWith("multipart/form-data")) {
+      bool hasFields = false;
+      MultipartRequest mp = new MultipartRequest(null, null);
+      if(hasFields)
+        postBody = mp;
+    }
+    else {
+    }
+
+    var response = await apiClient.invokeAPI(path,
+                                             'POST',
+                                             queryParams,
+                                             postBody,
+                                             headerParams,
+                                             formParams,
+                                             contentType,
+                                             authNames);
+
+    if(response.statusCode >= 400) {
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
+    } else if(response.body != null) {
+      return apiClient.deserialize(_decodeBodyBytes(response), 'Order') as Order;
+    } else {
+      return null;
+    }
+  }
+}

samples/client/petstore/dart/flutter_petstore/swagger/lib/api/user_api.dart

@@ -0,0 +1,409 @@
+part of openapi.api;
+
+
+
+class UserApi {
+  final ApiClient apiClient;
+
+  UserApi([ApiClient apiClient]) : apiClient = apiClient ?? defaultApiClient;
+
+  /// Create user
+  ///
+  /// This can only be done by the logged in user.
+  Future createUser(User body) async {
+    Object postBody = body;
+
+    // verify required params are set
+    if(body == null) {
+     throw new ApiException(400, "Missing required param: body");
+    }
+
+    // create path and map variables
+    String path = "/user".replaceAll("{format}","json");
+
+    // query params
+    List<QueryParam> queryParams = [];
+    Map<String, String> headerParams = {};
+    Map<String, String> formParams = {};
+
+    List<String> contentTypes = [];
+
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+    List<String> authNames = [];
+
+    if(contentType.startsWith("multipart/form-data")) {
+      bool hasFields = false;
+      MultipartRequest mp = new MultipartRequest(null, null);
+      if(hasFields)
+        postBody = mp;
+    }
+    else {
+    }
+
+    var response = await apiClient.invokeAPI(path,
+                                             'POST',
+                                             queryParams,
+                                             postBody,
+                                             headerParams,
+                                             formParams,
+                                             contentType,
+                                             authNames);
+
+    if(response.statusCode >= 400) {
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
+    } else if(response.body != null) {
+    } else {
+      return;
+    }
+  }
+  /// Creates list of users with given input array
+  ///
+  /// 
+  Future createUsersWithArrayInput(List<User> body) async {
+    Object postBody = body;
+
+    // verify required params are set
+    if(body == null) {
+     throw new ApiException(400, "Missing required param: body");
+    }
+
+    // create path and map variables
+    String path = "/user/createWithArray".replaceAll("{format}","json");
+
+    // query params
+    List<QueryParam> queryParams = [];
+    Map<String, String> headerParams = {};
+    Map<String, String> formParams = {};
+
+    List<String> contentTypes = [];
+
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+    List<String> authNames = [];
+
+    if(contentType.startsWith("multipart/form-data")) {
+      bool hasFields = false;
+      MultipartRequest mp = new MultipartRequest(null, null);
+      if(hasFields)
+        postBody = mp;
+    }
+    else {
+    }
+
+    var response = await apiClient.invokeAPI(path,
+                                             'POST',
+                                             queryParams,
+                                             postBody,
+                                             headerParams,
+                                             formParams,
+                                             contentType,
+                                             authNames);
+
+    if(response.statusCode >= 400) {
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
+    } else if(response.body != null) {
+    } else {
+      return;
+    }
+  }
+  /// Creates list of users with given input array
+  ///
+  /// 
+  Future createUsersWithListInput(List<User> body) async {
+    Object postBody = body;
+
+    // verify required params are set
+    if(body == null) {
+     throw new ApiException(400, "Missing required param: body");
+    }
+
+    // create path and map variables
+    String path = "/user/createWithList".replaceAll("{format}","json");
+
+    // query params
+    List<QueryParam> queryParams = [];
+    Map<String, String> headerParams = {};
+    Map<String, String> formParams = {};
+
+    List<String> contentTypes = [];
+
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+    List<String> authNames = [];
+
+    if(contentType.startsWith("multipart/form-data")) {
+      bool hasFields = false;
+      MultipartRequest mp = new MultipartRequest(null, null);
+      if(hasFields)
+        postBody = mp;
+    }
+    else {
+    }
+
+    var response = await apiClient.invokeAPI(path,
+                                             'POST',
+                                             queryParams,
+                                             postBody,
+                                             headerParams,
+                                             formParams,
+                                             contentType,
+                                             authNames);
+
+    if(response.statusCode >= 400) {
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
+    } else if(response.body != null) {
+    } else {
+      return;
+    }
+  }
+  /// Delete user
+  ///
+  /// This can only be done by the logged in user.
+  Future deleteUser(String username) async {
+    Object postBody;
+
+    // verify required params are set
+    if(username == null) {
+     throw new ApiException(400, "Missing required param: username");
+    }
+
+    // create path and map variables
+    String path = "/user/{username}".replaceAll("{format}","json").replaceAll("{" + "username" + "}", username.toString());
+
+    // query params
+    List<QueryParam> queryParams = [];
+    Map<String, String> headerParams = {};
+    Map<String, String> formParams = {};
+
+    List<String> contentTypes = [];
+
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+    List<String> authNames = [];
+
+    if(contentType.startsWith("multipart/form-data")) {
+      bool hasFields = false;
+      MultipartRequest mp = new MultipartRequest(null, null);
+      if(hasFields)
+        postBody = mp;
+    }
+    else {
+    }
+
+    var response = await apiClient.invokeAPI(path,
+                                             'DELETE',
+                                             queryParams,
+                                             postBody,
+                                             headerParams,
+                                             formParams,
+                                             contentType,
+                                             authNames);
+
+    if(response.statusCode >= 400) {
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
+    } else if(response.body != null) {
+    } else {
+      return;
+    }
+  }
+  /// Get user by user name
+  ///
+  /// 
+  Future<User> getUserByName(String username) async {
+    Object postBody;
+
+    // verify required params are set
+    if(username == null) {
+     throw new ApiException(400, "Missing required param: username");
+    }
+
+    // create path and map variables
+    String path = "/user/{username}".replaceAll("{format}","json").replaceAll("{" + "username" + "}", username.toString());
+
+    // query params
+    List<QueryParam> queryParams = [];
+    Map<String, String> headerParams = {};
+    Map<String, String> formParams = {};
+
+    List<String> contentTypes = [];
+
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+    List<String> authNames = [];
+
+    if(contentType.startsWith("multipart/form-data")) {
+      bool hasFields = false;
+      MultipartRequest mp = new MultipartRequest(null, null);
+      if(hasFields)
+        postBody = mp;
+    }
+    else {
+    }
+
+    var response = await apiClient.invokeAPI(path,
+                                             'GET',
+                                             queryParams,
+                                             postBody,
+                                             headerParams,
+                                             formParams,
+                                             contentType,
+                                             authNames);
+
+    if(response.statusCode >= 400) {
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
+    } else if(response.body != null) {
+      return apiClient.deserialize(_decodeBodyBytes(response), 'User') as User;
+    } else {
+      return null;
+    }
+  }
+  /// Logs user into the system
+  ///
+  /// 
+  Future<String> loginUser(String username, String password) async {
+    Object postBody;
+
+    // verify required params are set
+    if(username == null) {
+     throw new ApiException(400, "Missing required param: username");
+    }
+    if(password == null) {
+     throw new ApiException(400, "Missing required param: password");
+    }
+
+    // create path and map variables
+    String path = "/user/login".replaceAll("{format}","json");
+
+    // query params
+    List<QueryParam> queryParams = [];
+    Map<String, String> headerParams = {};
+    Map<String, String> formParams = {};
+      queryParams.addAll(_convertParametersForCollectionFormat("", "username", username));
+      queryParams.addAll(_convertParametersForCollectionFormat("", "password", password));
+
+    List<String> contentTypes = [];
+
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+    List<String> authNames = [];
+
+    if(contentType.startsWith("multipart/form-data")) {
+      bool hasFields = false;
+      MultipartRequest mp = new MultipartRequest(null, null);
+      if(hasFields)
+        postBody = mp;
+    }
+    else {
+    }
+
+    var response = await apiClient.invokeAPI(path,
+                                             'GET',
+                                             queryParams,
+                                             postBody,
+                                             headerParams,
+                                             formParams,
+                                             contentType,
+                                             authNames);
+
+    if(response.statusCode >= 400) {
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
+    } else if(response.body != null) {
+      return apiClient.deserialize(_decodeBodyBytes(response), 'String') as String;
+    } else {
+      return null;
+    }
+  }
+  /// Logs out current logged in user session
+  ///
+  /// 
+  Future logoutUser() async {
+    Object postBody;
+
+    // verify required params are set
+
+    // create path and map variables
+    String path = "/user/logout".replaceAll("{format}","json");
+
+    // query params
+    List<QueryParam> queryParams = [];
+    Map<String, String> headerParams = {};
+    Map<String, String> formParams = {};
+
+    List<String> contentTypes = [];
+
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+    List<String> authNames = [];
+
+    if(contentType.startsWith("multipart/form-data")) {
+      bool hasFields = false;
+      MultipartRequest mp = new MultipartRequest(null, null);
+      if(hasFields)
+        postBody = mp;
+    }
+    else {
+    }
+
+    var response = await apiClient.invokeAPI(path,
+                                             'GET',
+                                             queryParams,
+                                             postBody,
+                                             headerParams,
+                                             formParams,
+                                             contentType,
+                                             authNames);
+
+    if(response.statusCode >= 400) {
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
+    } else if(response.body != null) {
+    } else {
+      return;
+    }
+  }
+  /// Updated user
+  ///
+  /// This can only be done by the logged in user.
+  Future updateUser(String username, User body) async {
+    Object postBody = body;
+
+    // verify required params are set
+    if(username == null) {
+     throw new ApiException(400, "Missing required param: username");
+    }
+    if(body == null) {
+     throw new ApiException(400, "Missing required param: body");
+    }
+
+    // create path and map variables
+    String path = "/user/{username}".replaceAll("{format}","json").replaceAll("{" + "username" + "}", username.toString());
+
+    // query params
+    List<QueryParam> queryParams = [];
+    Map<String, String> headerParams = {};
+    Map<String, String> formParams = {};
+
+    List<String> contentTypes = [];
+
+    String contentType = contentTypes.length > 0 ? contentTypes[0] : "application/json";
+    List<String> authNames = [];
+
+    if(contentType.startsWith("multipart/form-data")) {
+      bool hasFields = false;
+      MultipartRequest mp = new MultipartRequest(null, null);
+      if(hasFields)
+        postBody = mp;
+    }
+    else {
+    }
+
+    var response = await apiClient.invokeAPI(path,
+                                             'PUT',
+                                             queryParams,
+                                             postBody,
+                                             headerParams,
+                                             formParams,
+                                             contentType,
+                                             authNames);
+
+    if(response.statusCode >= 400) {
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
+    } else if(response.body != null) {
+    } else {
+      return;
+    }
+  }
+}

samples/client/petstore/dart/flutter_petstore/swagger/lib/api_client.dart

@@ -0,0 +1,160 @@
+part of openapi.api;
+
+class QueryParam {
+  String name;
+  String value;
+
+  QueryParam(this.name, this.value);
+}
+
+class ApiClient {
+
+  String basePath;
+  var client = Client();
+
+  Map<String, String> _defaultHeaderMap = {};
+  Map<String, Authentication> _authentications = {};
+
+  final _regList = RegExp(r'^List<(.*)>$');
+  final _regMap = RegExp(r'^Map<String,(.*)>$');
+
+  ApiClient({this.basePath: "http://petstore.swagger.io/v2"}) {
+    // Setup authentications (key: authentication name, value: authentication).
+    _authentications['api_key'] = ApiKeyAuth("header", "api_key");
+    _authentications['petstore_auth'] = OAuth();
+  }
+
+  void addDefaultHeader(String key, String value) {
+     _defaultHeaderMap[key] = value;
+  }
+
+  dynamic _deserialize(dynamic value, String targetType) {
+    try {
+      switch (targetType) {
+        case 'String':
+          return '$value';
+        case 'int':
+          return value is int ? value : int.parse('$value');
+        case 'bool':
+          return value is bool ? value : '$value'.toLowerCase() == 'true';
+        case 'double':
+          return value is double ? value : double.parse('$value');
+        case 'ApiResponse':
+          return ApiResponse.fromJson(value);
+        case 'Category':
+          return Category.fromJson(value);
+        case 'Order':
+          return Order.fromJson(value);
+        case 'Pet':
+          return Pet.fromJson(value);
+        case 'Tag':
+          return Tag.fromJson(value);
+        case 'User':
+          return User.fromJson(value);
+        default:
+          {
+            Match match;
+            if (value is List &&
+                (match = _regList.firstMatch(targetType)) != null) {
+              var newTargetType = match[1];
+              return value.map((v) => _deserialize(v, newTargetType)).toList();
+            } else if (value is Map &&
+                (match = _regMap.firstMatch(targetType)) != null) {
+              var newTargetType = match[1];
+              return Map.fromIterables(value.keys,
+                  value.values.map((v) => _deserialize(v, newTargetType)));
+            }
+          }
+      }
+    } on Exception catch (e, stack) {
+      throw ApiException.withInner(500, 'Exception during deserialization.', e, stack);
+    }
+    throw ApiException(500, 'Could not find a suitable class for deserialization');
+  }
+
+  dynamic deserialize(String json, String targetType) {
+    // Remove all spaces.  Necessary for reg expressions as well.
+    targetType = targetType.replaceAll(' ', '');
+
+    if (targetType == 'String') return json;
+
+    var decodedJson = jsonDecode(json);
+    return _deserialize(decodedJson, targetType);
+  }
+
+  String serialize(Object obj) {
+    String serialized = '';
+    if (obj == null) {
+      serialized = '';
+    } else {
+      serialized = json.encode(obj);
+    }
+    return serialized;
+  }
+
+  // We don't use a Map<String, String> for queryParams.
+  // If collectionFormat is 'multi' a key might appear multiple times.
+  Future<Response> invokeAPI(String path,
+                             String method,
+                             Iterable<QueryParam> queryParams,
+                             Object body,
+                             Map<String, String> headerParams,
+                             Map<String, String> formParams,
+                             String contentType,
+                             List<String> authNames) async {
+
+    _updateParamsForAuth(authNames, queryParams, headerParams);
+
+    var ps = queryParams.where((p) => p.value != null).map((p) => '${p.name}=${p.value}');
+    String queryString = ps.isNotEmpty ?
+                         '?' + ps.join('&') :
+                         '';
+
+    String url = basePath + path + queryString;
+
+    headerParams.addAll(_defaultHeaderMap);
+    headerParams['Content-Type'] = contentType;
+
+    if(body is MultipartRequest) {
+      var request = MultipartRequest(method, Uri.parse(url));
+      request.fields.addAll(body.fields);
+      request.files.addAll(body.files);
+      request.headers.addAll(body.headers);
+      request.headers.addAll(headerParams);
+      var response = await client.send(request);
+      return Response.fromStream(response);
+    } else {
+      var msgBody = contentType == "application/x-www-form-urlencoded" ? formParams : serialize(body);
+      switch(method) {
+        case "POST":
+          return client.post(url, headers: headerParams, body: msgBody);
+        case "PUT":
+          return client.put(url, headers: headerParams, body: msgBody);
+        case "DELETE":
+          return client.delete(url, headers: headerParams);
+        case "PATCH":
+          return client.patch(url, headers: headerParams, body: msgBody);
+        default:
+          return client.get(url, headers: headerParams);
+      }
+    }
+  }
+
+  /// Update query and header parameters based on authentication settings.
+  /// @param authNames The authentications to apply
+  void _updateParamsForAuth(List<String> authNames, List<QueryParam> queryParams, Map<String, String> headerParams) {
+    authNames.forEach((authName) {
+      Authentication auth = _authentications[authName];
+      if (auth == null) throw ArgumentError("Authentication undefined: " + authName);
+      auth.applyToParams(queryParams, headerParams);
+    });
+  }
+
+  void setAccessToken(String accessToken) {
+    _authentications.forEach((key, auth) {
+      if (auth is OAuth) {
+        auth.setAccessToken(accessToken);
+      }
+    });
+  }
+}

samples/client/petstore/dart/flutter_petstore/swagger/lib/api_exception.dart

@@ -0,0 +1,23 @@
+part of openapi.api;
+
+class ApiException implements Exception {
+  int code = 0;
+  String message;
+  Exception innerException;
+  StackTrace stackTrace;
+
+  ApiException(this.code, this.message);
+
+  ApiException.withInner(this.code, this.message, this.innerException, this.stackTrace);
+
+  String toString() {
+    if (message == null) return "ApiException";
+
+    if (innerException == null) {
+      return "ApiException $code: $message";
+    }
+
+    return "ApiException $code: $message (Inner exception: $innerException)\n\n" +
+        stackTrace.toString();
+  }
+}

samples/client/petstore/dart/flutter_petstore/swagger/lib/api_helper.dart

@@ -0,0 +1,56 @@
+part of openapi.api;
+
+const _delimiters = const {'csv': ',', 'ssv': ' ', 'tsv': '\t', 'pipes': '|'};
+
+// port from Java version
+Iterable<QueryParam> _convertParametersForCollectionFormat(
+  String collectionFormat, String name, dynamic value) {
+  var params = <QueryParam>[];
+
+  // preconditions
+  if (name == null || name.isEmpty || value == null) return params;
+
+  if (value is! List) {
+    params.add(QueryParam(name, parameterToString(value)));
+    return params;
+  }
+
+  List values = value as List;
+
+  // get the collection format
+  collectionFormat = (collectionFormat == null || collectionFormat.isEmpty)
+                     ? "csv"
+                     : collectionFormat; // default: csv
+
+  if (collectionFormat == "multi") {
+    return values.map((v) => QueryParam(name, parameterToString(v)));
+  }
+
+  String delimiter = _delimiters[collectionFormat] ?? ",";
+
+  params.add(QueryParam(name, values.map((v) => parameterToString(v)).join(delimiter)));
+  return params;
+}
+
+/// Format the given parameter object into string.
+String parameterToString(dynamic value) {
+  if (value == null) {
+    return '';
+  } else if (value is DateTime) {
+    return value.toUtc().toIso8601String();
+  } else {
+    return value.toString();
+  }
+}
+
+/// Returns the decoded body by utf-8 if application/json with the given headers.
+/// Else, returns the decoded body by default algorithm of dart:http.
+/// Because avoid to text garbling when header only contains "application/json" without "; charset=utf-8".
+String _decodeBodyBytes(Response response) {
+  var contentType = response.headers['content-type'];
+  if (contentType != null && contentType.contains("application/json")) {
+    return utf8.decode(response.bodyBytes);
+  } else {
+    return response.body;
+  }
+}

samples/client/petstore/dart/flutter_petstore/swagger/lib/auth/api_key_auth.dart

@@ -0,0 +1,27 @@
+part of openapi.api;
+
+class ApiKeyAuth implements Authentication {
+
+  final String location;
+  final String paramName;
+  String apiKey;
+  String apiKeyPrefix;
+
+  ApiKeyAuth(this.location, this.paramName);
+
+  @override
+  void applyToParams(List<QueryParam> queryParams, Map<String, String> headerParams) {
+    String value;
+    if (apiKeyPrefix != null) {
+      value = '$apiKeyPrefix $apiKey';
+    } else {
+      value = apiKey;
+    }
+
+    if (location == 'query' && value != null) {
+      queryParams.add(QueryParam(paramName, value));
+    } else if (location == 'header' && value != null) {
+      headerParams[paramName] = value;
+    }
+  }
+}

samples/client/petstore/dart/flutter_petstore/swagger/lib/auth/authentication.dart

@@ -0,0 +1,7 @@
+part of openapi.api;
+
+abstract class Authentication {
+
+	/// Apply authentication settings to header and query params.
+	void applyToParams(List<QueryParam> queryParams, Map<String, String> headerParams);
+}

samples/client/petstore/dart/flutter_petstore/swagger/lib/auth/http_basic_auth.dart

@@ -0,0 +1,14 @@
+part of openapi.api;
+
+class HttpBasicAuth implements Authentication {
+
+  String username;
+  String password;
+
+  @override
+  void applyToParams(List<QueryParam> queryParams, Map<String, String> headerParams) {
+    String str = (username == null ? "" : username) + ":" + (password == null ? "" : password);
+    headerParams["Authorization"] = "Basic " + base64.encode(utf8.encode(str));
+  }
+
+}

samples/client/petstore/dart/flutter_petstore/swagger/lib/auth/oauth.dart

@@ -0,0 +1,18 @@
+part of openapi.api;
+
+class OAuth implements Authentication {
+  String accessToken;
+
+  OAuth({this.accessToken});
+
+  @override
+  void applyToParams(List<QueryParam> queryParams, Map<String, String> headerParams) {
+    if (accessToken != null) {
+      headerParams["Authorization"] = "Bearer " + accessToken;
+    }
+  }
+
+  void setAccessToken(String accessToken) {
+    this.accessToken = accessToken;
+  }
+}

samples/client/petstore/dart/flutter_petstore/swagger/lib/model/api_response.dart

@@ -0,0 +1,56 @@
+part of openapi.api;
+
+class ApiResponse {
+  
+  int code = null;
+  
+  String type = null;
+  
+  String message = null;
+  ApiResponse();
+
+  @override
+  String toString() {
+    return 'ApiResponse[code=$code, type=$type, message=$message, ]';
+  }
+
+  ApiResponse.fromJson(Map<String, dynamic> json) {
+    if (json == null) return;
+    if (json['code'] == null) {
+      code = null;
+    } else {
+          code = json['code'];
+    }
+    if (json['type'] == null) {
+      type = null;
+    } else {
+          type = json['type'];
+    }
+    if (json['message'] == null) {
+      message = null;
+    } else {
+          message = json['message'];
+    }
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'code': code,
+      'type': type,
+      'message': message
+    };
+  }
+
+  static List<ApiResponse> listFromJson(List<dynamic> json) {
+    return json == null ? new List<ApiResponse>() : json.map((value) => new ApiResponse.fromJson(value)).toList();
+  }
+
+  static Map<String, ApiResponse> mapFromJson(Map<String, dynamic> json) {
+    var map = new Map<String, ApiResponse>();
+    if (json != null && json.length > 0) {
+      json.forEach((String key, dynamic value) => map[key] = new ApiResponse.fromJson(value));
+    }
+    return map;
+  }
+}
+

samples/client/petstore/dart/flutter_petstore/swagger/lib/model/category.dart

@@ -0,0 +1,48 @@
+part of openapi.api;
+
+class Category {
+  
+  int id = null;
+  
+  String name = null;
+  Category();
+
+  @override
+  String toString() {
+    return 'Category[id=$id, name=$name, ]';
+  }
+
+  Category.fromJson(Map<String, dynamic> json) {
+    if (json == null) return;
+    if (json['id'] == null) {
+      id = null;
+    } else {
+          id = json['id'];
+    }
+    if (json['name'] == null) {
+      name = null;
+    } else {
+          name = json['name'];
+    }
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'id': id,
+      'name': name
+    };
+  }
+
+  static List<Category> listFromJson(List<dynamic> json) {
+    return json == null ? new List<Category>() : json.map((value) => new Category.fromJson(value)).toList();
+  }
+
+  static Map<String, Category> mapFromJson(Map<String, dynamic> json) {
+    var map = new Map<String, Category>();
+    if (json != null && json.length > 0) {
+      json.forEach((String key, dynamic value) => map[key] = new Category.fromJson(value));
+    }
+    return map;
+  }
+}
+

samples/client/petstore/dart/flutter_petstore/swagger/lib/model/order.dart

@@ -0,0 +1,81 @@
+part of openapi.api;
+
+class Order {
+  
+  int id = null;
+  
+  int petId = null;
+  
+  int quantity = null;
+  
+  DateTime shipDate = null;
+  /* Order Status */
+  String status = null;
+  //enum statusEnum {  placed,  approved,  delivered,  };{
+  
+  bool complete = false;
+  Order();
+
+  @override
+  String toString() {
+    return 'Order[id=$id, petId=$petId, quantity=$quantity, shipDate=$shipDate, status=$status, complete=$complete, ]';
+  }
+
+  Order.fromJson(Map<String, dynamic> json) {
+    if (json == null) return;
+    if (json['id'] == null) {
+      id = null;
+    } else {
+          id = json['id'];
+    }
+    if (json['petId'] == null) {
+      petId = null;
+    } else {
+          petId = json['petId'];
+    }
+    if (json['quantity'] == null) {
+      quantity = null;
+    } else {
+          quantity = json['quantity'];
+    }
+    if (json['shipDate'] == null) {
+      shipDate = null;
+    } else {
+      shipDate = DateTime.parse(json['shipDate']);
+    }
+    if (json['status'] == null) {
+      status = null;
+    } else {
+          status = json['status'];
+    }
+    if (json['complete'] == null) {
+      complete = null;
+    } else {
+          complete = json['complete'];
+    }
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'id': id,
+      'petId': petId,
+      'quantity': quantity,
+      'shipDate': shipDate == null ? '' : shipDate.toUtc().toIso8601String(),
+      'status': status,
+      'complete': complete
+    };
+  }
+
+  static List<Order> listFromJson(List<dynamic> json) {
+    return json == null ? new List<Order>() : json.map((value) => new Order.fromJson(value)).toList();
+  }
+
+  static Map<String, Order> mapFromJson(Map<String, dynamic> json) {
+    var map = new Map<String, Order>();
+    if (json != null && json.length > 0) {
+      json.forEach((String key, dynamic value) => map[key] = new Order.fromJson(value));
+    }
+    return map;
+  }
+}
+

samples/client/petstore/dart/flutter_petstore/swagger/lib/model/pet.dart

@@ -0,0 +1,81 @@
+part of openapi.api;
+
+class Pet {
+  
+  int id = null;
+  
+  Category category = null;
+  
+  String name = null;
+  
+  List<String> photoUrls = [];
+  
+  List<Tag> tags = [];
+  /* pet status in the store */
+  String status = null;
+  //enum statusEnum {  available,  pending,  sold,  };{
+  Pet();
+
+  @override
+  String toString() {
+    return 'Pet[id=$id, category=$category, name=$name, photoUrls=$photoUrls, tags=$tags, status=$status, ]';
+  }
+
+  Pet.fromJson(Map<String, dynamic> json) {
+    if (json == null) return;
+    if (json['id'] == null) {
+      id = null;
+    } else {
+          id = json['id'];
+    }
+    if (json['category'] == null) {
+      category = null;
+    } else {
+      category = new Category.fromJson(json['category']);
+    }
+    if (json['name'] == null) {
+      name = null;
+    } else {
+          name = json['name'];
+    }
+    if (json['photoUrls'] == null) {
+      photoUrls = null;
+    } else {
+      photoUrls = (json['photoUrls'] as List).cast<String>();
+    }
+    if (json['tags'] == null) {
+      tags = null;
+    } else {
+      tags = Tag.listFromJson(json['tags']);
+    }
+    if (json['status'] == null) {
+      status = null;
+    } else {
+          status = json['status'];
+    }
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'id': id,
+      'category': category,
+      'name': name,
+      'photoUrls': photoUrls,
+      'tags': tags,
+      'status': status
+    };
+  }
+
+  static List<Pet> listFromJson(List<dynamic> json) {
+    return json == null ? new List<Pet>() : json.map((value) => new Pet.fromJson(value)).toList();
+  }
+
+  static Map<String, Pet> mapFromJson(Map<String, dynamic> json) {
+    var map = new Map<String, Pet>();
+    if (json != null && json.length > 0) {
+      json.forEach((String key, dynamic value) => map[key] = new Pet.fromJson(value));
+    }
+    return map;
+  }
+}
+

samples/client/petstore/dart/flutter_petstore/swagger/lib/model/tag.dart

@@ -0,0 +1,48 @@
+part of openapi.api;
+
+class Tag {
+  
+  int id = null;
+  
+  String name = null;
+  Tag();
+
+  @override
+  String toString() {
+    return 'Tag[id=$id, name=$name, ]';
+  }
+
+  Tag.fromJson(Map<String, dynamic> json) {
+    if (json == null) return;
+    if (json['id'] == null) {
+      id = null;
+    } else {
+          id = json['id'];
+    }
+    if (json['name'] == null) {
+      name = null;
+    } else {
+          name = json['name'];
+    }
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'id': id,
+      'name': name
+    };
+  }
+
+  static List<Tag> listFromJson(List<dynamic> json) {
+    return json == null ? new List<Tag>() : json.map((value) => new Tag.fromJson(value)).toList();
+  }
+
+  static Map<String, Tag> mapFromJson(Map<String, dynamic> json) {
+    var map = new Map<String, Tag>();
+    if (json != null && json.length > 0) {
+      json.forEach((String key, dynamic value) => map[key] = new Tag.fromJson(value));
+    }
+    return map;
+  }
+}
+

samples/client/petstore/dart/flutter_petstore/swagger/lib/model/user.dart

@@ -0,0 +1,96 @@
+part of openapi.api;
+
+class User {
+  
+  int id = null;
+  
+  String username = null;
+  
+  String firstName = null;
+  
+  String lastName = null;
+  
+  String email = null;
+  
+  String password = null;
+  
+  String phone = null;
+  /* User Status */
+  int userStatus = null;
+  User();
+
+  @override
+  String toString() {
+    return 'User[id=$id, username=$username, firstName=$firstName, lastName=$lastName, email=$email, password=$password, phone=$phone, userStatus=$userStatus, ]';
+  }
+
+  User.fromJson(Map<String, dynamic> json) {
+    if (json == null) return;
+    if (json['id'] == null) {
+      id = null;
+    } else {
+          id = json['id'];
+    }
+    if (json['username'] == null) {
+      username = null;
+    } else {
+          username = json['username'];
+    }
+    if (json['firstName'] == null) {
+      firstName = null;
+    } else {
+          firstName = json['firstName'];
+    }
+    if (json['lastName'] == null) {
+      lastName = null;
+    } else {
+          lastName = json['lastName'];
+    }
+    if (json['email'] == null) {
+      email = null;
+    } else {
+          email = json['email'];
+    }
+    if (json['password'] == null) {
+      password = null;
+    } else {
+          password = json['password'];
+    }
+    if (json['phone'] == null) {
+      phone = null;
+    } else {
+          phone = json['phone'];
+    }
+    if (json['userStatus'] == null) {
+      userStatus = null;
+    } else {
+          userStatus = json['userStatus'];
+    }
+  }
+
+  Map<String, dynamic> toJson() {
+    return {
+      'id': id,
+      'username': username,
+      'firstName': firstName,
+      'lastName': lastName,
+      'email': email,
+      'password': password,
+      'phone': phone,
+      'userStatus': userStatus
+    };
+  }
+
+  static List<User> listFromJson(List<dynamic> json) {
+    return json == null ? new List<User>() : json.map((value) => new User.fromJson(value)).toList();
+  }
+
+  static Map<String, User> mapFromJson(Map<String, dynamic> json) {
+    var map = new Map<String, User>();
+    if (json != null && json.length > 0) {
+      json.forEach((String key, dynamic value) => map[key] = new User.fromJson(value));
+    }
+    return map;
+  }
+}
+

samples/client/petstore/dart/flutter_petstore/swagger/pubspec.yaml

@@ -0,0 +1,7 @@
+name: openapi
+version: 1.0.0
+description: OpenAPI API client
+environment:
+  sdk: '>=2.0.0 <3.0.0'
+dependencies:
+  http: '>=0.11.1 <0.12.0'

samples/client/petstore/dart/openapi-browser-client/lib/api/pet_api.dart

@@ -50,7 +50,7 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -100,7 +100,7 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -150,9 +150,9 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return (apiClient.deserialize(response.body, 'List<Pet>') as List).map((item) => item as Pet).toList();
+      return (apiClient.deserialize(_decodeBodyBytes(response), 'List<Pet>') as List).map((item) => item as Pet).toList();
     } else {
       return null;
     }
@@ -201,9 +201,9 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return (apiClient.deserialize(response.body, 'List<Pet>') as List).map((item) => item as Pet).toList();
+      return (apiClient.deserialize(_decodeBodyBytes(response), 'List<Pet>') as List).map((item) => item as Pet).toList();
     } else {
       return null;
     }
@@ -251,9 +251,9 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return apiClient.deserialize(response.body, 'Pet') as Pet;
+      return apiClient.deserialize(_decodeBodyBytes(response), 'Pet') as Pet;
     } else {
       return null;
     }
@@ -301,7 +301,7 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -362,7 +362,7 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -422,9 +422,9 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return apiClient.deserialize(response.body, 'ApiResponse') as ApiResponse;
+      return apiClient.deserialize(_decodeBodyBytes(response), 'ApiResponse') as ApiResponse;
     } else {
       return null;
     }

samples/client/petstore/dart/openapi-browser-client/lib/api/store_api.dart

@@ -50,7 +50,7 @@ class StoreApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -96,9 +96,9 @@ class StoreApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return new Map<String, int>.from(apiClient.deserialize(response.body, 'Map<String, int>'));
+      return new Map<String, int>.from(apiClient.deserialize(_decodeBodyBytes(response), 'Map<String, int>'));
           ;
     } else {
       return null;
@@ -147,9 +147,9 @@ class StoreApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return apiClient.deserialize(response.body, 'Order') as Order;
+      return apiClient.deserialize(_decodeBodyBytes(response), 'Order') as Order;
     } else {
       return null;
     }
@@ -197,9 +197,9 @@ class StoreApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return apiClient.deserialize(response.body, 'Order') as Order;
+      return apiClient.deserialize(_decodeBodyBytes(response), 'Order') as Order;
     } else {
       return null;
     }

samples/client/petstore/dart/openapi-browser-client/lib/api/user_api.dart

@@ -50,7 +50,7 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -99,7 +99,7 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -148,7 +148,7 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -197,7 +197,7 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -246,9 +246,9 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return apiClient.deserialize(response.body, 'User') as User;
+      return apiClient.deserialize(_decodeBodyBytes(response), 'User') as User;
     } else {
       return null;
     }
@@ -301,9 +301,9 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return apiClient.deserialize(response.body, 'String') as String;
+      return apiClient.deserialize(_decodeBodyBytes(response), 'String') as String;
     } else {
       return null;
     }
@@ -348,7 +348,7 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -400,7 +400,7 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;

samples/client/petstore/dart/openapi-browser-client/lib/api_helper.dart

@@ -42,3 +42,15 @@ String parameterToString(dynamic value) {
     return value.toString();
   }
 }
+
+/// Returns the decoded body by utf-8 if application/json with the given headers.
+/// Else, returns the decoded body by default algorithm of dart:http.
+/// Because avoid to text garbling when header only contains "application/json" without "; charset=utf-8".
+String _decodeBodyBytes(Response response) {
+  var contentType = response.headers['content-type'];
+  if (contentType != null && contentType.contains("application/json")) {
+    return utf8.decode(response.bodyBytes);
+  } else {
+    return response.body;
+  }
+}

samples/client/petstore/dart/openapi/lib/api/pet_api.dart

@@ -50,7 +50,7 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -100,7 +100,7 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -150,9 +150,9 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return (apiClient.deserialize(response.body, 'List<Pet>') as List).map((item) => item as Pet).toList();
+      return (apiClient.deserialize(_decodeBodyBytes(response), 'List<Pet>') as List).map((item) => item as Pet).toList();
     } else {
       return null;
     }
@@ -201,9 +201,9 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return (apiClient.deserialize(response.body, 'List<Pet>') as List).map((item) => item as Pet).toList();
+      return (apiClient.deserialize(_decodeBodyBytes(response), 'List<Pet>') as List).map((item) => item as Pet).toList();
     } else {
       return null;
     }
@@ -251,9 +251,9 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return apiClient.deserialize(response.body, 'Pet') as Pet;
+      return apiClient.deserialize(_decodeBodyBytes(response), 'Pet') as Pet;
     } else {
       return null;
     }
@@ -301,7 +301,7 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -362,7 +362,7 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -422,9 +422,9 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return apiClient.deserialize(response.body, 'ApiResponse') as ApiResponse;
+      return apiClient.deserialize(_decodeBodyBytes(response), 'ApiResponse') as ApiResponse;
     } else {
       return null;
     }

samples/client/petstore/dart/openapi/lib/api/store_api.dart

@@ -50,7 +50,7 @@ class StoreApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -96,9 +96,9 @@ class StoreApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return new Map<String, int>.from(apiClient.deserialize(response.body, 'Map<String, int>'));
+      return new Map<String, int>.from(apiClient.deserialize(_decodeBodyBytes(response), 'Map<String, int>'));
           ;
     } else {
       return null;
@@ -147,9 +147,9 @@ class StoreApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return apiClient.deserialize(response.body, 'Order') as Order;
+      return apiClient.deserialize(_decodeBodyBytes(response), 'Order') as Order;
     } else {
       return null;
     }
@@ -197,9 +197,9 @@ class StoreApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return apiClient.deserialize(response.body, 'Order') as Order;
+      return apiClient.deserialize(_decodeBodyBytes(response), 'Order') as Order;
     } else {
       return null;
     }

samples/client/petstore/dart/openapi/lib/api/user_api.dart

@@ -50,7 +50,7 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -99,7 +99,7 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -148,7 +148,7 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -197,7 +197,7 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -246,9 +246,9 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return apiClient.deserialize(response.body, 'User') as User;
+      return apiClient.deserialize(_decodeBodyBytes(response), 'User') as User;
     } else {
       return null;
     }
@@ -301,9 +301,9 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return apiClient.deserialize(response.body, 'String') as String;
+      return apiClient.deserialize(_decodeBodyBytes(response), 'String') as String;
     } else {
       return null;
     }
@@ -348,7 +348,7 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -400,7 +400,7 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;

samples/client/petstore/dart/openapi/lib/api_helper.dart

@@ -42,3 +42,15 @@ String parameterToString(dynamic value) {
     return value.toString();
   }
 }
+
+/// Returns the decoded body by utf-8 if application/json with the given headers.
+/// Else, returns the decoded body by default algorithm of dart:http.
+/// Because avoid to text garbling when header only contains "application/json" without "; charset=utf-8".
+String _decodeBodyBytes(Response response) {
+  var contentType = response.headers['content-type'];
+  if (contentType != null && contentType.contains("application/json")) {
+    return utf8.decode(response.bodyBytes);
+  } else {
+    return response.body;
+  }
+}

samples/client/petstore/dart2/flutter_petstore/openapi/lib/api/pet_api.dart

@@ -50,7 +50,7 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -100,7 +100,7 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -150,9 +150,9 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return (apiClient.deserialize(response.body, 'List<Pet>') as List).map((item) => item as Pet).toList();
+      return (apiClient.deserialize(_decodeBodyBytes(response), 'List<Pet>') as List).map((item) => item as Pet).toList();
     } else {
       return null;
     }
@@ -201,9 +201,9 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return (apiClient.deserialize(response.body, 'List<Pet>') as List).map((item) => item as Pet).toList();
+      return (apiClient.deserialize(_decodeBodyBytes(response), 'List<Pet>') as List).map((item) => item as Pet).toList();
     } else {
       return null;
     }
@@ -251,9 +251,9 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return apiClient.deserialize(response.body, 'Pet') as Pet;
+      return apiClient.deserialize(_decodeBodyBytes(response), 'Pet') as Pet;
     } else {
       return null;
     }
@@ -301,7 +301,7 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -362,7 +362,7 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -422,9 +422,9 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return apiClient.deserialize(response.body, 'ApiResponse') as ApiResponse;
+      return apiClient.deserialize(_decodeBodyBytes(response), 'ApiResponse') as ApiResponse;
     } else {
       return null;
     }

samples/client/petstore/dart2/flutter_petstore/openapi/lib/api/store_api.dart

@@ -50,7 +50,7 @@ class StoreApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -96,9 +96,9 @@ class StoreApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return new Map<String, int>.from(apiClient.deserialize(response.body, 'Map<String, int>'));
+      return new Map<String, int>.from(apiClient.deserialize(_decodeBodyBytes(response), 'Map<String, int>'));
           ;
     } else {
       return null;
@@ -147,9 +147,9 @@ class StoreApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return apiClient.deserialize(response.body, 'Order') as Order;
+      return apiClient.deserialize(_decodeBodyBytes(response), 'Order') as Order;
     } else {
       return null;
     }
@@ -197,9 +197,9 @@ class StoreApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return apiClient.deserialize(response.body, 'Order') as Order;
+      return apiClient.deserialize(_decodeBodyBytes(response), 'Order') as Order;
     } else {
       return null;
     }

samples/client/petstore/dart2/flutter_petstore/openapi/lib/api/user_api.dart

@@ -50,7 +50,7 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -99,7 +99,7 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -148,7 +148,7 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -197,7 +197,7 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -246,9 +246,9 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return apiClient.deserialize(response.body, 'User') as User;
+      return apiClient.deserialize(_decodeBodyBytes(response), 'User') as User;
     } else {
       return null;
     }
@@ -301,9 +301,9 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return apiClient.deserialize(response.body, 'String') as String;
+      return apiClient.deserialize(_decodeBodyBytes(response), 'String') as String;
     } else {
       return null;
     }
@@ -348,7 +348,7 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -400,7 +400,7 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;

samples/client/petstore/dart2/flutter_petstore/openapi/lib/api_helper.dart

@@ -42,3 +42,15 @@ String parameterToString(dynamic value) {
     return value.toString();
   }
 }
+
+/// Returns the decoded body by utf-8 if application/json with the given headers.
+/// Else, returns the decoded body by default algorithm of dart:http.
+/// Because avoid to text garbling when header only contains "application/json" without "; charset=utf-8".
+String _decodeBodyBytes(Response response) {
+  var contentType = response.headers['content-type'];
+  if (contentType != null && contentType.contains("application/json")) {
+    return utf8.decode(response.bodyBytes);
+  } else {
+    return response.body;
+  }
+}

samples/client/petstore/dart2/flutter_petstore/openapi/lib/model/api_response.dart

@@ -19,17 +19,17 @@ class ApiResponse {
     if (json['code'] == null) {
       code = null;
     } else {
-      code = json['code'];
+          code = json['code'];
     }
     if (json['type'] == null) {
       type = null;
     } else {
-      type = json['type'];
+          type = json['type'];
     }
     if (json['message'] == null) {
       message = null;
     } else {
-      message = json['message'];
+          message = json['message'];
     }
   }
 

samples/client/petstore/dart2/flutter_petstore/openapi/lib/model/category.dart

@@ -17,12 +17,12 @@ class Category {
     if (json['id'] == null) {
       id = null;
     } else {
-      id = json['id'];
+          id = json['id'];
     }
     if (json['name'] == null) {
       name = null;
     } else {
-      name = json['name'];
+          name = json['name'];
     }
   }
 

samples/client/petstore/dart2/flutter_petstore/openapi/lib/model/order.dart

@@ -26,17 +26,17 @@ class Order {
     if (json['id'] == null) {
       id = null;
     } else {
-      id = json['id'];
+          id = json['id'];
     }
     if (json['petId'] == null) {
       petId = null;
     } else {
-      petId = json['petId'];
+          petId = json['petId'];
     }
     if (json['quantity'] == null) {
       quantity = null;
     } else {
-      quantity = json['quantity'];
+          quantity = json['quantity'];
     }
     if (json['shipDate'] == null) {
       shipDate = null;
@@ -46,12 +46,12 @@ class Order {
     if (json['status'] == null) {
       status = null;
     } else {
-      status = json['status'];
+          status = json['status'];
     }
     if (json['complete'] == null) {
       complete = null;
     } else {
-      complete = json['complete'];
+          complete = json['complete'];
     }
   }
 

samples/client/petstore/dart2/flutter_petstore/openapi/lib/model/pet.dart

@@ -26,7 +26,7 @@ class Pet {
     if (json['id'] == null) {
       id = null;
     } else {
-      id = json['id'];
+          id = json['id'];
     }
     if (json['category'] == null) {
       category = null;
@@ -36,12 +36,12 @@ class Pet {
     if (json['name'] == null) {
       name = null;
     } else {
-      name = json['name'];
+          name = json['name'];
     }
     if (json['photoUrls'] == null) {
       photoUrls = null;
     } else {
-      photoUrls = ((json['photoUrls'] ?? []) as List).map((item) => item as String).toList();
+      photoUrls = (json['photoUrls'] as List).cast<String>();
     }
     if (json['tags'] == null) {
       tags = null;
@@ -51,7 +51,7 @@ class Pet {
     if (json['status'] == null) {
       status = null;
     } else {
-      status = json['status'];
+          status = json['status'];
     }
   }
 

samples/client/petstore/dart2/flutter_petstore/openapi/lib/model/tag.dart

@@ -17,12 +17,12 @@ class Tag {
     if (json['id'] == null) {
       id = null;
     } else {
-      id = json['id'];
+          id = json['id'];
     }
     if (json['name'] == null) {
       name = null;
     } else {
-      name = json['name'];
+          name = json['name'];
     }
   }
 

samples/client/petstore/dart2/flutter_petstore/openapi/lib/model/user.dart

@@ -29,42 +29,42 @@ class User {
     if (json['id'] == null) {
       id = null;
     } else {
-      id = json['id'];
+          id = json['id'];
     }
     if (json['username'] == null) {
       username = null;
     } else {
-      username = json['username'];
+          username = json['username'];
     }
     if (json['firstName'] == null) {
       firstName = null;
     } else {
-      firstName = json['firstName'];
+          firstName = json['firstName'];
     }
     if (json['lastName'] == null) {
       lastName = null;
     } else {
-      lastName = json['lastName'];
+          lastName = json['lastName'];
     }
     if (json['email'] == null) {
       email = null;
     } else {
-      email = json['email'];
+          email = json['email'];
     }
     if (json['password'] == null) {
       password = null;
     } else {
-      password = json['password'];
+          password = json['password'];
     }
     if (json['phone'] == null) {
       phone = null;
     } else {
-      phone = json['phone'];
+          phone = json['phone'];
     }
     if (json['userStatus'] == null) {
       userStatus = null;
     } else {
-      userStatus = json['userStatus'];
+          userStatus = json['userStatus'];
     }
   }
 

samples/client/petstore/dart2/openapi-browser-client/lib/api/pet_api.dart

@@ -50,7 +50,7 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -100,7 +100,7 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -150,9 +150,9 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return (apiClient.deserialize(response.body, 'List<Pet>') as List).map((item) => item as Pet).toList();
+      return (apiClient.deserialize(_decodeBodyBytes(response), 'List<Pet>') as List).map((item) => item as Pet).toList();
     } else {
       return null;
     }
@@ -201,9 +201,9 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return (apiClient.deserialize(response.body, 'List<Pet>') as List).map((item) => item as Pet).toList();
+      return (apiClient.deserialize(_decodeBodyBytes(response), 'List<Pet>') as List).map((item) => item as Pet).toList();
     } else {
       return null;
     }
@@ -251,9 +251,9 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return apiClient.deserialize(response.body, 'Pet') as Pet;
+      return apiClient.deserialize(_decodeBodyBytes(response), 'Pet') as Pet;
     } else {
       return null;
     }
@@ -301,7 +301,7 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -362,7 +362,7 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -422,9 +422,9 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return apiClient.deserialize(response.body, 'ApiResponse') as ApiResponse;
+      return apiClient.deserialize(_decodeBodyBytes(response), 'ApiResponse') as ApiResponse;
     } else {
       return null;
     }

samples/client/petstore/dart2/openapi-browser-client/lib/api/store_api.dart

@@ -50,7 +50,7 @@ class StoreApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -96,9 +96,9 @@ class StoreApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return new Map<String, int>.from(apiClient.deserialize(response.body, 'Map<String, int>'));
+      return new Map<String, int>.from(apiClient.deserialize(_decodeBodyBytes(response), 'Map<String, int>'));
           ;
     } else {
       return null;
@@ -147,9 +147,9 @@ class StoreApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return apiClient.deserialize(response.body, 'Order') as Order;
+      return apiClient.deserialize(_decodeBodyBytes(response), 'Order') as Order;
     } else {
       return null;
     }
@@ -197,9 +197,9 @@ class StoreApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return apiClient.deserialize(response.body, 'Order') as Order;
+      return apiClient.deserialize(_decodeBodyBytes(response), 'Order') as Order;
     } else {
       return null;
     }

samples/client/petstore/dart2/openapi-browser-client/lib/api/user_api.dart

@@ -50,7 +50,7 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -99,7 +99,7 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -148,7 +148,7 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -197,7 +197,7 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -246,9 +246,9 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return apiClient.deserialize(response.body, 'User') as User;
+      return apiClient.deserialize(_decodeBodyBytes(response), 'User') as User;
     } else {
       return null;
     }
@@ -301,9 +301,9 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return apiClient.deserialize(response.body, 'String') as String;
+      return apiClient.deserialize(_decodeBodyBytes(response), 'String') as String;
     } else {
       return null;
     }
@@ -348,7 +348,7 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -400,7 +400,7 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;

samples/client/petstore/dart2/openapi-browser-client/lib/api_helper.dart

@@ -42,3 +42,15 @@ String parameterToString(dynamic value) {
     return value.toString();
   }
 }
+
+/// Returns the decoded body by utf-8 if application/json with the given headers.
+/// Else, returns the decoded body by default algorithm of dart:http.
+/// Because avoid to text garbling when header only contains "application/json" without "; charset=utf-8".
+String _decodeBodyBytes(Response response) {
+  var contentType = response.headers['content-type'];
+  if (contentType != null && contentType.contains("application/json")) {
+    return utf8.decode(response.bodyBytes);
+  } else {
+    return response.body;
+  }
+}

samples/client/petstore/dart2/openapi-browser-client/lib/model/api_response.dart

@@ -19,17 +19,17 @@ class ApiResponse {
     if (json['code'] == null) {
       code = null;
     } else {
-      code = json['code'];
+          code = json['code'];
     }
     if (json['type'] == null) {
       type = null;
     } else {
-      type = json['type'];
+          type = json['type'];
     }
     if (json['message'] == null) {
       message = null;
     } else {
-      message = json['message'];
+          message = json['message'];
     }
   }
 

samples/client/petstore/dart2/openapi-browser-client/lib/model/category.dart

@@ -17,12 +17,12 @@ class Category {
     if (json['id'] == null) {
       id = null;
     } else {
-      id = json['id'];
+          id = json['id'];
     }
     if (json['name'] == null) {
       name = null;
     } else {
-      name = json['name'];
+          name = json['name'];
     }
   }
 

samples/client/petstore/dart2/openapi-browser-client/lib/model/order.dart

@@ -26,17 +26,17 @@ class Order {
     if (json['id'] == null) {
       id = null;
     } else {
-      id = json['id'];
+          id = json['id'];
     }
     if (json['petId'] == null) {
       petId = null;
     } else {
-      petId = json['petId'];
+          petId = json['petId'];
     }
     if (json['quantity'] == null) {
       quantity = null;
     } else {
-      quantity = json['quantity'];
+          quantity = json['quantity'];
     }
     if (json['shipDate'] == null) {
       shipDate = null;
@@ -46,12 +46,12 @@ class Order {
     if (json['status'] == null) {
       status = null;
     } else {
-      status = json['status'];
+          status = json['status'];
     }
     if (json['complete'] == null) {
       complete = null;
     } else {
-      complete = json['complete'];
+          complete = json['complete'];
     }
   }
 

samples/client/petstore/dart2/openapi-browser-client/lib/model/pet.dart

@@ -26,7 +26,7 @@ class Pet {
     if (json['id'] == null) {
       id = null;
     } else {
-      id = json['id'];
+          id = json['id'];
     }
     if (json['category'] == null) {
       category = null;
@@ -36,12 +36,12 @@ class Pet {
     if (json['name'] == null) {
       name = null;
     } else {
-      name = json['name'];
+          name = json['name'];
     }
     if (json['photoUrls'] == null) {
       photoUrls = null;
     } else {
-      photoUrls = ((json['photoUrls'] ?? []) as List).map((item) => item as String).toList();
+      photoUrls = (json['photoUrls'] as List).cast<String>();
     }
     if (json['tags'] == null) {
       tags = null;
@@ -51,7 +51,7 @@ class Pet {
     if (json['status'] == null) {
       status = null;
     } else {
-      status = json['status'];
+          status = json['status'];
     }
   }
 

samples/client/petstore/dart2/openapi-browser-client/lib/model/tag.dart

@@ -17,12 +17,12 @@ class Tag {
     if (json['id'] == null) {
       id = null;
     } else {
-      id = json['id'];
+          id = json['id'];
     }
     if (json['name'] == null) {
       name = null;
     } else {
-      name = json['name'];
+          name = json['name'];
     }
   }
 

samples/client/petstore/dart2/openapi-browser-client/lib/model/user.dart

@@ -29,42 +29,42 @@ class User {
     if (json['id'] == null) {
       id = null;
     } else {
-      id = json['id'];
+          id = json['id'];
     }
     if (json['username'] == null) {
       username = null;
     } else {
-      username = json['username'];
+          username = json['username'];
     }
     if (json['firstName'] == null) {
       firstName = null;
     } else {
-      firstName = json['firstName'];
+          firstName = json['firstName'];
     }
     if (json['lastName'] == null) {
       lastName = null;
     } else {
-      lastName = json['lastName'];
+          lastName = json['lastName'];
     }
     if (json['email'] == null) {
       email = null;
     } else {
-      email = json['email'];
+          email = json['email'];
     }
     if (json['password'] == null) {
       password = null;
     } else {
-      password = json['password'];
+          password = json['password'];
     }
     if (json['phone'] == null) {
       phone = null;
     } else {
-      phone = json['phone'];
+          phone = json['phone'];
     }
     if (json['userStatus'] == null) {
       userStatus = null;
     } else {
-      userStatus = json['userStatus'];
+          userStatus = json['userStatus'];
     }
   }
 

samples/client/petstore/dart2/openapi/lib/api/pet_api.dart

@@ -50,7 +50,7 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -100,7 +100,7 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -150,9 +150,9 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return (apiClient.deserialize(response.body, 'List<Pet>') as List).map((item) => item as Pet).toList();
+      return (apiClient.deserialize(_decodeBodyBytes(response), 'List<Pet>') as List).map((item) => item as Pet).toList();
     } else {
       return null;
     }
@@ -201,9 +201,9 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return (apiClient.deserialize(response.body, 'List<Pet>') as List).map((item) => item as Pet).toList();
+      return (apiClient.deserialize(_decodeBodyBytes(response), 'List<Pet>') as List).map((item) => item as Pet).toList();
     } else {
       return null;
     }
@@ -251,9 +251,9 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return apiClient.deserialize(response.body, 'Pet') as Pet;
+      return apiClient.deserialize(_decodeBodyBytes(response), 'Pet') as Pet;
     } else {
       return null;
     }
@@ -301,7 +301,7 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -362,7 +362,7 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -422,9 +422,9 @@ class PetApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return apiClient.deserialize(response.body, 'ApiResponse') as ApiResponse;
+      return apiClient.deserialize(_decodeBodyBytes(response), 'ApiResponse') as ApiResponse;
     } else {
       return null;
     }

samples/client/petstore/dart2/openapi/lib/api/store_api.dart

@@ -50,7 +50,7 @@ class StoreApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -96,9 +96,9 @@ class StoreApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return new Map<String, int>.from(apiClient.deserialize(response.body, 'Map<String, int>'));
+      return new Map<String, int>.from(apiClient.deserialize(_decodeBodyBytes(response), 'Map<String, int>'));
           ;
     } else {
       return null;
@@ -147,9 +147,9 @@ class StoreApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return apiClient.deserialize(response.body, 'Order') as Order;
+      return apiClient.deserialize(_decodeBodyBytes(response), 'Order') as Order;
     } else {
       return null;
     }
@@ -197,9 +197,9 @@ class StoreApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return apiClient.deserialize(response.body, 'Order') as Order;
+      return apiClient.deserialize(_decodeBodyBytes(response), 'Order') as Order;
     } else {
       return null;
     }

samples/client/petstore/dart2/openapi/lib/api/user_api.dart

@@ -50,7 +50,7 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -99,7 +99,7 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -148,7 +148,7 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -197,7 +197,7 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -246,9 +246,9 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return apiClient.deserialize(response.body, 'User') as User;
+      return apiClient.deserialize(_decodeBodyBytes(response), 'User') as User;
     } else {
       return null;
     }
@@ -301,9 +301,9 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
-      return apiClient.deserialize(response.body, 'String') as String;
+      return apiClient.deserialize(_decodeBodyBytes(response), 'String') as String;
     } else {
       return null;
     }
@@ -348,7 +348,7 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;
@@ -400,7 +400,7 @@ class UserApi {
                                              authNames);
 
     if(response.statusCode >= 400) {
-      throw new ApiException(response.statusCode, response.body);
+      throw new ApiException(response.statusCode, _decodeBodyBytes(response));
     } else if(response.body != null) {
     } else {
       return;

samples/client/petstore/dart2/openapi/lib/api_helper.dart

@@ -42,3 +42,15 @@ String parameterToString(dynamic value) {
     return value.toString();
   }
 }
+
+/// Returns the decoded body by utf-8 if application/json with the given headers.
+/// Else, returns the decoded body by default algorithm of dart:http.
+/// Because avoid to text garbling when header only contains "application/json" without "; charset=utf-8".
+String _decodeBodyBytes(Response response) {
+  var contentType = response.headers['content-type'];
+  if (contentType != null && contentType.contains("application/json")) {
+    return utf8.decode(response.bodyBytes);
+  } else {
+    return response.body;
+  }
+}

samples/client/petstore/dart2/openapi/lib/model/api_response.dart

@@ -19,17 +19,17 @@ class ApiResponse {
     if (json['code'] == null) {
       code = null;
     } else {
-      code = json['code'];
+          code = json['code'];
     }
     if (json['type'] == null) {
       type = null;
     } else {
-      type = json['type'];
+          type = json['type'];
     }
     if (json['message'] == null) {
       message = null;
     } else {
-      message = json['message'];
+          message = json['message'];
     }
   }
 

samples/client/petstore/dart2/openapi/lib/model/category.dart

@@ -17,12 +17,12 @@ class Category {
     if (json['id'] == null) {
       id = null;
     } else {
-      id = json['id'];
+          id = json['id'];
     }
     if (json['name'] == null) {
       name = null;
     } else {
-      name = json['name'];
+          name = json['name'];
     }
   }
 

samples/client/petstore/dart2/openapi/lib/model/order.dart

@@ -26,17 +26,17 @@ class Order {
     if (json['id'] == null) {
       id = null;
     } else {
-      id = json['id'];
+          id = json['id'];
     }
     if (json['petId'] == null) {
       petId = null;
     } else {
-      petId = json['petId'];
+          petId = json['petId'];
     }
     if (json['quantity'] == null) {
       quantity = null;
     } else {
-      quantity = json['quantity'];
+          quantity = json['quantity'];
     }
     if (json['shipDate'] == null) {
       shipDate = null;
@@ -46,12 +46,12 @@ class Order {
     if (json['status'] == null) {
       status = null;
     } else {
-      status = json['status'];
+          status = json['status'];
     }
     if (json['complete'] == null) {
       complete = null;
     } else {
-      complete = json['complete'];
+          complete = json['complete'];
     }
   }
 

samples/client/petstore/dart2/openapi/lib/model/pet.dart

@@ -26,7 +26,7 @@ class Pet {
     if (json['id'] == null) {
       id = null;
     } else {
-      id = json['id'];
+          id = json['id'];
     }
     if (json['category'] == null) {
       category = null;
@@ -36,12 +36,12 @@ class Pet {
     if (json['name'] == null) {
       name = null;
     } else {
-      name = json['name'];
+          name = json['name'];
     }
     if (json['photoUrls'] == null) {
       photoUrls = null;
     } else {
-      photoUrls = ((json['photoUrls'] ?? []) as List).map((item) => item as String).toList();
+      photoUrls = (json['photoUrls'] as List).cast<String>();
     }
     if (json['tags'] == null) {
       tags = null;
@@ -51,7 +51,7 @@ class Pet {
     if (json['status'] == null) {
       status = null;
     } else {
-      status = json['status'];
+          status = json['status'];
     }
   }
 

samples/client/petstore/dart2/openapi/lib/model/tag.dart

@@ -17,12 +17,12 @@ class Tag {
     if (json['id'] == null) {
       id = null;
     } else {
-      id = json['id'];
+          id = json['id'];
     }
     if (json['name'] == null) {
       name = null;
     } else {
-      name = json['name'];
+          name = json['name'];
     }
   }
 

samples/client/petstore/dart2/openapi/lib/model/user.dart

@@ -29,42 +29,42 @@ class User {
     if (json['id'] == null) {
       id = null;
     } else {
-      id = json['id'];
+          id = json['id'];
     }
     if (json['username'] == null) {
       username = null;
     } else {
-      username = json['username'];
+          username = json['username'];
     }
     if (json['firstName'] == null) {
       firstName = null;
     } else {
-      firstName = json['firstName'];
+          firstName = json['firstName'];
     }
     if (json['lastName'] == null) {
       lastName = null;
     } else {
-      lastName = json['lastName'];
+          lastName = json['lastName'];
     }
     if (json['email'] == null) {
       email = null;
     } else {
-      email = json['email'];
+          email = json['email'];
     }
     if (json['password'] == null) {
       password = null;
     } else {
-      password = json['password'];
+          password = json['password'];
     }
     if (json['phone'] == null) {
       phone = null;
     } else {
-      phone = json['phone'];
+          phone = json['phone'];
     }
     if (json['userStatus'] == null) {
       userStatus = null;
     } else {
-      userStatus = json['userStatus'];
+          userStatus = json['userStatus'];
     }
   }