diff --git a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartDioClientCodegen.java b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartDioClientCodegen.java index d951a2d05f45..f61e1b7b55cb 100644 --- a/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartDioClientCodegen.java +++ b/modules/openapi-generator/src/main/java/org/openapitools/codegen/languages/DartDioClientCodegen.java @@ -78,8 +78,9 @@ public DartDioClientCodegen() { typeMapping.put("file", "Uint8List"); typeMapping.put("binary", "Uint8List"); - importMapping.put("BuiltList", "built_collection/built_collection"); - importMapping.put("BuiltMap", "built_collection/built_collection"); + importMapping.put("BuiltList", "package:built_collection/built_collection.dart"); + importMapping.put("BuiltMap", "package:built_collection/built_collection.dart"); + importMapping.put("Uint8List", "dart:typed_data"); } @Override @@ -208,7 +209,7 @@ public Map postProcessModels(Map objs) { modelImports.add(importMapping.get(modelImport)); } else { if (!modelToIgnore.contains(modelImport.toLowerCase(Locale.ROOT))) { - modelImports.add(pubName + "/model/" + underscore(modelImport)); + modelImports.add("package:" + pubName + "/model/" + underscore(modelImport) + ".dart"); } } } diff --git a/modules/openapi-generator/src/main/resources/dart-dio/model.mustache b/modules/openapi-generator/src/main/resources/dart-dio/model.mustache index da50fb566125..ff2c84d195cc 100644 --- a/modules/openapi-generator/src/main/resources/dart-dio/model.mustache +++ b/modules/openapi-generator/src/main/resources/dart-dio/model.mustache @@ -1,7 +1,7 @@ {{#models}} {{#model}} {{#imports}} - import 'package:{{.}}.dart'; + import '{{.}}'; {{/imports}} {{#isEnum}}{{>enum}}{{/isEnum}}{{^isEnum}}{{>class}}{{/isEnum}} {{/model}} diff --git a/modules/openapi-generator/src/main/resources/dart-dio/pubspec.mustache b/modules/openapi-generator/src/main/resources/dart-dio/pubspec.mustache index d69417f7cbdb..0cfa432854b1 100644 --- a/modules/openapi-generator/src/main/resources/dart-dio/pubspec.mustache +++ b/modules/openapi-generator/src/main/resources/dart-dio/pubspec.mustache @@ -4,10 +4,10 @@ description: {{pubDescription}} environment: sdk: ">=2.3.0 <3.0.0" dependencies: - dio: ^3.0.3 - built_value: 6.7.0 - built_collection: 4.2.2 + dio: ^3.0.4 + built_value: ^6.8.2 + built_collection: ^4.2.2 dev_dependencies: - built_value_generator: ^6.7.1 + built_value_generator: ^6.8.2 build_runner: ^1.7.1 test: 1.6.5 \ No newline at end of file diff --git a/samples/client/petstore/dart-dio/README.md b/samples/client/petstore/dart-dio/README.md index 761bbe9d322e..824ea71074dc 100644 --- a/samples/client/petstore/dart-dio/README.md +++ b/samples/client/petstore/dart-dio/README.md @@ -4,6 +4,7 @@ This is a sample server Petstore server. For this sample, you can use the api ke This Dart package is automatically generated by the [OpenAPI Generator](https://openapi-generator.tech) project: - API version: 1.0.0 +- Build date: 2019-10-30T08:32:55.947+13:00[Pacific/Auckland] - Build package: org.openapitools.codegen.languages.DartDioClientCodegen ## Requirements diff --git a/samples/client/petstore/dart-dio/lib/api.dart b/samples/client/petstore/dart-dio/lib/api.dart index 8fc03c1fec90..b2575064fbf3 100644 --- a/samples/client/petstore/dart-dio/lib/api.dart +++ b/samples/client/petstore/dart-dio/lib/api.dart @@ -8,52 +8,45 @@ import 'package:openapi/api/pet_api.dart'; import 'package:openapi/api/store_api.dart'; import 'package:openapi/api/user_api.dart'; - class Openapi { + Dio dio; + Serializers serializers; + String basePath = "http://petstore.swagger.io/v2"; - Dio dio; - Serializers serializers; - String basePath = "http://petstore.swagger.io/v2"; - - Openapi({this.dio, Serializers serializers}) { + Openapi({this.dio, Serializers serializers}) { if (dio == null) { - BaseOptions options = new BaseOptions( - baseUrl: basePath, - connectTimeout: 5000, - receiveTimeout: 3000, - ); - this.dio = new Dio(options); + BaseOptions options = new BaseOptions( + baseUrl: basePath, + connectTimeout: 5000, + receiveTimeout: 3000, + ); + this.dio = new Dio(options); } this.serializers = serializers ?? standardSerializers; -} + } - - /** + /** * Get PetApi instance, base route and serializer can be overridden by a given but be careful, * by doing that all interceptors will not be executed */ - PetApi getPetApi() { + PetApi getPetApi() { return PetApi(dio, serializers); - } - + } - /** + /** * Get StoreApi instance, base route and serializer can be overridden by a given but be careful, * by doing that all interceptors will not be executed */ - StoreApi getStoreApi() { + StoreApi getStoreApi() { return StoreApi(dio, serializers); - } - + } - /** + /** * Get UserApi instance, base route and serializer can be overridden by a given but be careful, * by doing that all interceptors will not be executed */ - UserApi getUserApi() { + UserApi getUserApi() { return UserApi(dio, serializers); - } - - -} \ No newline at end of file + } +} diff --git a/samples/client/petstore/dart-dio/lib/api/pet_api.dart b/samples/client/petstore/dart-dio/lib/api/pet_api.dart index 4b182c95f3ea..e65520ad76cd 100644 --- a/samples/client/petstore/dart-dio/lib/api/pet_api.dart +++ b/samples/client/petstore/dart-dio/lib/api/pet_api.dart @@ -10,322 +10,367 @@ import 'package:openapi/model/api_response.dart'; import 'dart:typed_data'; class PetApi { - final Dio _dio; - Serializers _serializers; - - PetApi(this._dio, this._serializers); - - /// Add a new pet to the store - /// - /// - FutureaddPet(Pet body,{ CancelToken cancelToken, Map headers,}) async { - - String path = "/pet"; - - // query params - Map queryParams = {}; - Map headerParams = Map.from(headers ?? {}); - Map formParams = {}; - - queryParams.removeWhere((key, value) => value == null); - headerParams.removeWhere((key, value) => value == null); - formParams.removeWhere((key, value) => value == null); - - List contentTypes = [ - "application/json", - "application/xml"]; - - var serializedBody = _serializers.serialize(body); - var jsonbody = json.encode(serializedBody); - - return _dio.request( - path, - queryParameters: queryParams, - data: jsonbody, - options: Options( - method: 'post'.toUpperCase(), - headers: headerParams, - contentType: contentTypes.isNotEmpty ? contentTypes[0] : "application/json", - ), - cancelToken: cancelToken, - ); - } - /// Deletes a pet - /// - /// - FuturedeletePet(int petId,{ String apiKey,CancelToken cancelToken, Map headers,}) async { - - String path = "/pet/{petId}".replaceAll("{" + "petId" + "}", petId.toString()); - - // query params - Map queryParams = {}; - Map headerParams = Map.from(headers ?? {}); - Map formParams = {}; - - headerParams["api_key"] = apiKey; - queryParams.removeWhere((key, value) => value == null); - headerParams.removeWhere((key, value) => value == null); - formParams.removeWhere((key, value) => value == null); - - List contentTypes = []; - - - return _dio.request( - path, - queryParameters: queryParams, - options: Options( - method: 'delete'.toUpperCase(), - headers: headerParams, - contentType: contentTypes.isNotEmpty ? contentTypes[0] : "application/json", - ), - cancelToken: cancelToken, - ); - } - /// Finds Pets by status - /// - /// Multiple status values can be provided with comma separated strings - Future>>findPetsByStatus(List status,{ CancelToken cancelToken, Map headers,}) async { - - String path = "/pet/findByStatus"; - - // query params - Map queryParams = {}; - Map headerParams = Map.from(headers ?? {}); - Map formParams = {}; - - queryParams["status"] = status; - queryParams.removeWhere((key, value) => value == null); - headerParams.removeWhere((key, value) => value == null); - formParams.removeWhere((key, value) => value == null); - - List contentTypes = []; - - - return _dio.request( - path, - queryParameters: queryParams, - options: Options( - method: 'get'.toUpperCase(), - headers: headerParams, - contentType: contentTypes.isNotEmpty ? contentTypes[0] : "application/json", - ), - cancelToken: cancelToken, - ).then((response) { - - final FullType type = const FullType(BuiltList, const [const FullType(Pet)]); - BuiltList dataList = _serializers.deserialize(response.data, specifiedType: type); - var data = dataList.toList(); - - return Response>( - data: data, - headers: response.headers, - request: response.request, - redirects: response.redirects, - statusCode: response.statusCode, - statusMessage: response.statusMessage, - extra: response.extra, - ); - }); - } - /// Finds Pets by tags - /// - /// Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. - Future>>findPetsByTags(List tags,{ CancelToken cancelToken, Map headers,}) async { - - String path = "/pet/findByTags"; - - // query params - Map queryParams = {}; - Map headerParams = Map.from(headers ?? {}); - Map formParams = {}; - - queryParams["tags"] = tags; - queryParams.removeWhere((key, value) => value == null); - headerParams.removeWhere((key, value) => value == null); - formParams.removeWhere((key, value) => value == null); - - List contentTypes = []; - - - return _dio.request( - path, - queryParameters: queryParams, - options: Options( - method: 'get'.toUpperCase(), - headers: headerParams, - contentType: contentTypes.isNotEmpty ? contentTypes[0] : "application/json", - ), - cancelToken: cancelToken, - ).then((response) { - - final FullType type = const FullType(BuiltList, const [const FullType(Pet)]); - BuiltList dataList = _serializers.deserialize(response.data, specifiedType: type); - var data = dataList.toList(); - - return Response>( - data: data, - headers: response.headers, - request: response.request, - redirects: response.redirects, - statusCode: response.statusCode, - statusMessage: response.statusMessage, - extra: response.extra, - ); - }); - } - /// Find pet by ID - /// - /// Returns a single pet - Future>getPetById(int petId,{ CancelToken cancelToken, Map headers,}) async { - - String path = "/pet/{petId}".replaceAll("{" + "petId" + "}", petId.toString()); - - // query params - Map queryParams = {}; - Map headerParams = Map.from(headers ?? {}); - Map formParams = {}; - - queryParams.removeWhere((key, value) => value == null); - headerParams.removeWhere((key, value) => value == null); - formParams.removeWhere((key, value) => value == null); - - List contentTypes = []; - - - return _dio.request( - path, - queryParameters: queryParams, - options: Options( - method: 'get'.toUpperCase(), - headers: headerParams, - contentType: contentTypes.isNotEmpty ? contentTypes[0] : "application/json", - ), - cancelToken: cancelToken, - ).then((response) { - - var serializer = _serializers.serializerForType(Pet); - var data = _serializers.deserializeWith(serializer, response.data); - - return Response( - data: data, - headers: response.headers, - request: response.request, - redirects: response.redirects, - statusCode: response.statusCode, - statusMessage: response.statusMessage, - extra: response.extra, - ); - }); - } - /// Update an existing pet - /// - /// - FutureupdatePet(Pet body,{ CancelToken cancelToken, Map headers,}) async { - - String path = "/pet"; - - // query params - Map queryParams = {}; - Map headerParams = Map.from(headers ?? {}); - Map formParams = {}; - - queryParams.removeWhere((key, value) => value == null); - headerParams.removeWhere((key, value) => value == null); - formParams.removeWhere((key, value) => value == null); - - List contentTypes = [ - "application/json", - "application/xml"]; - - var serializedBody = _serializers.serialize(body); - var jsonbody = json.encode(serializedBody); - - return _dio.request( - path, - queryParameters: queryParams, - data: jsonbody, - options: Options( - method: 'put'.toUpperCase(), - headers: headerParams, - contentType: contentTypes.isNotEmpty ? contentTypes[0] : "application/json", - ), - cancelToken: cancelToken, - ); - } - /// Updates a pet in the store with form data - /// - /// - FutureupdatePetWithForm(int petId,{ String name,String status,CancelToken cancelToken, Map headers,}) async { - - String path = "/pet/{petId}".replaceAll("{" + "petId" + "}", petId.toString()); - - // query params - Map queryParams = {}; - Map headerParams = Map.from(headers ?? {}); - Map formParams = {}; - - queryParams.removeWhere((key, value) => value == null); - headerParams.removeWhere((key, value) => value == null); - formParams.removeWhere((key, value) => value == null); - - List contentTypes = [ - "application/x-www-form-urlencoded"]; - - - return _dio.request( - path, - queryParameters: queryParams, - options: Options( - method: 'post'.toUpperCase(), - headers: headerParams, - contentType: contentTypes.isNotEmpty ? contentTypes[0] : "application/json", - ), - cancelToken: cancelToken, - ); - } - /// uploads an image - /// - /// - Future>uploadFile(int petId,{ String additionalMetadata,Uint8List file,CancelToken cancelToken, Map headers,}) async { - - String path = "/pet/{petId}/uploadImage".replaceAll("{" + "petId" + "}", petId.toString()); - - // query params - Map queryParams = {}; - Map headerParams = Map.from(headers ?? {}); - Map formParams = {}; - - queryParams.removeWhere((key, value) => value == null); - headerParams.removeWhere((key, value) => value == null); - formParams.removeWhere((key, value) => value == null); - - List contentTypes = [ - "multipart/form-data"]; - - - return _dio.request( - path, - queryParameters: queryParams, - options: Options( - method: 'post'.toUpperCase(), - headers: headerParams, - contentType: contentTypes.isNotEmpty ? contentTypes[0] : "application/json", - ), - cancelToken: cancelToken, - ).then((response) { - - var serializer = _serializers.serializerForType(ApiResponse); - var data = _serializers.deserializeWith(serializer, response.data); - - return Response( - data: data, - headers: response.headers, - request: response.request, - redirects: response.redirects, - statusCode: response.statusCode, - statusMessage: response.statusMessage, - extra: response.extra, - ); - }); - } - } + final Dio _dio; + Serializers _serializers; + + PetApi(this._dio, this._serializers); + + /// Add a new pet to the store + /// + /// + Future addPet( + Pet body, { + CancelToken cancelToken, + Map headers, + }) async { + String path = "/pet"; + + // query params + Map queryParams = {}; + Map headerParams = Map.from(headers ?? {}); + Map formParams = {}; + + queryParams.removeWhere((key, value) => value == null); + headerParams.removeWhere((key, value) => value == null); + formParams.removeWhere((key, value) => value == null); + + List contentTypes = ["application/json", "application/xml"]; + + var serializedBody = _serializers.serialize(body); + var jsonbody = json.encode(serializedBody); + + return _dio.request( + path, + queryParameters: queryParams, + data: jsonbody, + options: Options( + method: 'post'.toUpperCase(), + headers: headerParams, + contentType: + contentTypes.isNotEmpty ? contentTypes[0] : "application/json", + ), + cancelToken: cancelToken, + ); + } + + /// Deletes a pet + /// + /// + Future deletePet( + int petId, { + String apiKey, + CancelToken cancelToken, + Map headers, + }) async { + String path = + "/pet/{petId}".replaceAll("{" + "petId" + "}", petId.toString()); + + // query params + Map queryParams = {}; + Map headerParams = Map.from(headers ?? {}); + Map formParams = {}; + + headerParams["api_key"] = apiKey; + queryParams.removeWhere((key, value) => value == null); + headerParams.removeWhere((key, value) => value == null); + formParams.removeWhere((key, value) => value == null); + + List contentTypes = []; + + return _dio.request( + path, + queryParameters: queryParams, + options: Options( + method: 'delete'.toUpperCase(), + headers: headerParams, + contentType: + contentTypes.isNotEmpty ? contentTypes[0] : "application/json", + ), + cancelToken: cancelToken, + ); + } + + /// Finds Pets by status + /// + /// Multiple status values can be provided with comma separated strings + Future>> findPetsByStatus( + List status, { + CancelToken cancelToken, + Map headers, + }) async { + String path = "/pet/findByStatus"; + + // query params + Map queryParams = {}; + Map headerParams = Map.from(headers ?? {}); + Map formParams = {}; + + queryParams["status"] = status; + queryParams.removeWhere((key, value) => value == null); + headerParams.removeWhere((key, value) => value == null); + formParams.removeWhere((key, value) => value == null); + + List contentTypes = []; + + return _dio + .request( + path, + queryParameters: queryParams, + options: Options( + method: 'get'.toUpperCase(), + headers: headerParams, + contentType: + contentTypes.isNotEmpty ? contentTypes[0] : "application/json", + ), + cancelToken: cancelToken, + ) + .then((response) { + final FullType type = + const FullType(BuiltList, const [const FullType(Pet)]); + BuiltList dataList = + _serializers.deserialize(response.data, specifiedType: type); + var data = dataList.toList(); + + return Response>( + data: data, + headers: response.headers, + request: response.request, + redirects: response.redirects, + statusCode: response.statusCode, + statusMessage: response.statusMessage, + extra: response.extra, + ); + }); + } + + /// Finds Pets by tags + /// + /// Multiple tags can be provided with comma separated strings. Use tag1, tag2, tag3 for testing. + Future>> findPetsByTags( + List tags, { + CancelToken cancelToken, + Map headers, + }) async { + String path = "/pet/findByTags"; + + // query params + Map queryParams = {}; + Map headerParams = Map.from(headers ?? {}); + Map formParams = {}; + + queryParams["tags"] = tags; + queryParams.removeWhere((key, value) => value == null); + headerParams.removeWhere((key, value) => value == null); + formParams.removeWhere((key, value) => value == null); + + List contentTypes = []; + + return _dio + .request( + path, + queryParameters: queryParams, + options: Options( + method: 'get'.toUpperCase(), + headers: headerParams, + contentType: + contentTypes.isNotEmpty ? contentTypes[0] : "application/json", + ), + cancelToken: cancelToken, + ) + .then((response) { + final FullType type = + const FullType(BuiltList, const [const FullType(Pet)]); + BuiltList dataList = + _serializers.deserialize(response.data, specifiedType: type); + var data = dataList.toList(); + + return Response>( + data: data, + headers: response.headers, + request: response.request, + redirects: response.redirects, + statusCode: response.statusCode, + statusMessage: response.statusMessage, + extra: response.extra, + ); + }); + } + + /// Find pet by ID + /// + /// Returns a single pet + Future> getPetById( + int petId, { + CancelToken cancelToken, + Map headers, + }) async { + String path = + "/pet/{petId}".replaceAll("{" + "petId" + "}", petId.toString()); + + // query params + Map queryParams = {}; + Map headerParams = Map.from(headers ?? {}); + Map formParams = {}; + + queryParams.removeWhere((key, value) => value == null); + headerParams.removeWhere((key, value) => value == null); + formParams.removeWhere((key, value) => value == null); + + List contentTypes = []; + + return _dio + .request( + path, + queryParameters: queryParams, + options: Options( + method: 'get'.toUpperCase(), + headers: headerParams, + contentType: + contentTypes.isNotEmpty ? contentTypes[0] : "application/json", + ), + cancelToken: cancelToken, + ) + .then((response) { + var serializer = _serializers.serializerForType(Pet); + var data = _serializers.deserializeWith(serializer, response.data); + + return Response( + data: data, + headers: response.headers, + request: response.request, + redirects: response.redirects, + statusCode: response.statusCode, + statusMessage: response.statusMessage, + extra: response.extra, + ); + }); + } + + /// Update an existing pet + /// + /// + Future updatePet( + Pet body, { + CancelToken cancelToken, + Map headers, + }) async { + String path = "/pet"; + + // query params + Map queryParams = {}; + Map headerParams = Map.from(headers ?? {}); + Map formParams = {}; + + queryParams.removeWhere((key, value) => value == null); + headerParams.removeWhere((key, value) => value == null); + formParams.removeWhere((key, value) => value == null); + + List contentTypes = ["application/json", "application/xml"]; + + var serializedBody = _serializers.serialize(body); + var jsonbody = json.encode(serializedBody); + + return _dio.request( + path, + queryParameters: queryParams, + data: jsonbody, + options: Options( + method: 'put'.toUpperCase(), + headers: headerParams, + contentType: + contentTypes.isNotEmpty ? contentTypes[0] : "application/json", + ), + cancelToken: cancelToken, + ); + } + + /// Updates a pet in the store with form data + /// + /// + Future updatePetWithForm( + int petId, { + String name, + String status, + CancelToken cancelToken, + Map headers, + }) async { + String path = + "/pet/{petId}".replaceAll("{" + "petId" + "}", petId.toString()); + + // query params + Map queryParams = {}; + Map headerParams = Map.from(headers ?? {}); + Map formParams = {}; + + queryParams.removeWhere((key, value) => value == null); + headerParams.removeWhere((key, value) => value == null); + formParams.removeWhere((key, value) => value == null); + + List contentTypes = ["application/x-www-form-urlencoded"]; + + return _dio.request( + path, + queryParameters: queryParams, + options: Options( + method: 'post'.toUpperCase(), + headers: headerParams, + contentType: + contentTypes.isNotEmpty ? contentTypes[0] : "application/json", + ), + cancelToken: cancelToken, + ); + } + + /// uploads an image + /// + /// + Future> uploadFile( + int petId, { + String additionalMetadata, + Uint8List file, + CancelToken cancelToken, + Map headers, + }) async { + String path = "/pet/{petId}/uploadImage" + .replaceAll("{" + "petId" + "}", petId.toString()); + + // query params + Map queryParams = {}; + Map headerParams = Map.from(headers ?? {}); + Map formParams = {}; + + queryParams.removeWhere((key, value) => value == null); + headerParams.removeWhere((key, value) => value == null); + formParams.removeWhere((key, value) => value == null); + + List contentTypes = ["multipart/form-data"]; + + return _dio + .request( + path, + queryParameters: queryParams, + options: Options( + method: 'post'.toUpperCase(), + headers: headerParams, + contentType: + contentTypes.isNotEmpty ? contentTypes[0] : "application/json", + ), + cancelToken: cancelToken, + ) + .then((response) { + var serializer = _serializers.serializerForType(ApiResponse); + var data = + _serializers.deserializeWith(serializer, response.data); + + return Response( + data: data, + headers: response.headers, + request: response.request, + redirects: response.redirects, + statusCode: response.statusCode, + statusMessage: response.statusMessage, + extra: response.extra, + ); + }); + } +} diff --git a/samples/client/petstore/dart-dio/lib/api/user_api.dart b/samples/client/petstore/dart-dio/lib/api/user_api.dart index 521be8729347..d10f5fea5932 100644 --- a/samples/client/petstore/dart-dio/lib/api/user_api.dart +++ b/samples/client/petstore/dart-dio/lib/api/user_api.dart @@ -8,293 +8,337 @@ import 'package:built_value/serializer.dart'; import 'package:openapi/model/user.dart'; class UserApi { - final Dio _dio; - Serializers _serializers; - - UserApi(this._dio, this._serializers); - - /// Create user - /// - /// This can only be done by the logged in user. - FuturecreateUser(User body,{ CancelToken cancelToken, Map headers,}) async { - - String path = "/user"; - - // query params - Map queryParams = {}; - Map headerParams = Map.from(headers ?? {}); - Map formParams = {}; - - queryParams.removeWhere((key, value) => value == null); - headerParams.removeWhere((key, value) => value == null); - formParams.removeWhere((key, value) => value == null); - - List contentTypes = []; - - var serializedBody = _serializers.serialize(body); - var jsonbody = json.encode(serializedBody); - - return _dio.request( - path, - queryParameters: queryParams, - data: jsonbody, - options: Options( - method: 'post'.toUpperCase(), - headers: headerParams, - contentType: contentTypes.isNotEmpty ? contentTypes[0] : "application/json", - ), - cancelToken: cancelToken, - ); - } - /// Creates list of users with given input array - /// - /// - FuturecreateUsersWithArrayInput(List body,{ CancelToken cancelToken, Map headers,}) async { - - String path = "/user/createWithArray"; - - // query params - Map queryParams = {}; - Map headerParams = Map.from(headers ?? {}); - Map formParams = {}; - - queryParams.removeWhere((key, value) => value == null); - headerParams.removeWhere((key, value) => value == null); - formParams.removeWhere((key, value) => value == null); - - List contentTypes = []; - - final type = const FullType(BuiltList, const [const FullType(User)]); - var serializedBody = _serializers.serialize(BuiltList.from(body), specifiedType: type); - var jsonbody = json.encode(serializedBody); - - return _dio.request( - path, - queryParameters: queryParams, - data: jsonbody, - options: Options( - method: 'post'.toUpperCase(), - headers: headerParams, - contentType: contentTypes.isNotEmpty ? contentTypes[0] : "application/json", - ), - cancelToken: cancelToken, - ); - } - /// Creates list of users with given input array - /// - /// - FuturecreateUsersWithListInput(List body,{ CancelToken cancelToken, Map headers,}) async { - - String path = "/user/createWithList"; - - // query params - Map queryParams = {}; - Map headerParams = Map.from(headers ?? {}); - Map formParams = {}; - - queryParams.removeWhere((key, value) => value == null); - headerParams.removeWhere((key, value) => value == null); - formParams.removeWhere((key, value) => value == null); - - List contentTypes = []; - - final type = const FullType(BuiltList, const [const FullType(User)]); - var serializedBody = _serializers.serialize(BuiltList.from(body), specifiedType: type); - var jsonbody = json.encode(serializedBody); - - return _dio.request( - path, - queryParameters: queryParams, - data: jsonbody, - options: Options( - method: 'post'.toUpperCase(), - headers: headerParams, - contentType: contentTypes.isNotEmpty ? contentTypes[0] : "application/json", - ), - cancelToken: cancelToken, - ); - } - /// Delete user - /// - /// This can only be done by the logged in user. - FuturedeleteUser(String username,{ CancelToken cancelToken, Map headers,}) async { - - String path = "/user/{username}".replaceAll("{" + "username" + "}", username.toString()); - - // query params - Map queryParams = {}; - Map headerParams = Map.from(headers ?? {}); - Map formParams = {}; - - queryParams.removeWhere((key, value) => value == null); - headerParams.removeWhere((key, value) => value == null); - formParams.removeWhere((key, value) => value == null); - - List contentTypes = []; - - - return _dio.request( - path, - queryParameters: queryParams, - options: Options( - method: 'delete'.toUpperCase(), - headers: headerParams, - contentType: contentTypes.isNotEmpty ? contentTypes[0] : "application/json", - ), - cancelToken: cancelToken, - ); - } - /// Get user by user name - /// - /// - Future>getUserByName(String username,{ CancelToken cancelToken, Map headers,}) async { - - String path = "/user/{username}".replaceAll("{" + "username" + "}", username.toString()); - - // query params - Map queryParams = {}; - Map headerParams = Map.from(headers ?? {}); - Map formParams = {}; - - queryParams.removeWhere((key, value) => value == null); - headerParams.removeWhere((key, value) => value == null); - formParams.removeWhere((key, value) => value == null); - - List contentTypes = []; - - - return _dio.request( - path, - queryParameters: queryParams, - options: Options( - method: 'get'.toUpperCase(), - headers: headerParams, - contentType: contentTypes.isNotEmpty ? contentTypes[0] : "application/json", - ), - cancelToken: cancelToken, - ).then((response) { - - var serializer = _serializers.serializerForType(User); - var data = _serializers.deserializeWith(serializer, response.data); - - return Response( - data: data, - headers: response.headers, - request: response.request, - redirects: response.redirects, - statusCode: response.statusCode, - statusMessage: response.statusMessage, - extra: response.extra, - ); - }); - } - /// Logs user into the system - /// - /// - Future>loginUser(String username,String password,{ CancelToken cancelToken, Map headers,}) async { - - String path = "/user/login"; - - // query params - Map queryParams = {}; - Map headerParams = Map.from(headers ?? {}); - Map formParams = {}; - - queryParams["username"] = username; - queryParams["password"] = password; - queryParams.removeWhere((key, value) => value == null); - headerParams.removeWhere((key, value) => value == null); - formParams.removeWhere((key, value) => value == null); - - List contentTypes = []; - - - return _dio.request( - path, - queryParameters: queryParams, - options: Options( - method: 'get'.toUpperCase(), - headers: headerParams, - contentType: contentTypes.isNotEmpty ? contentTypes[0] : "application/json", - ), - cancelToken: cancelToken, - ).then((response) { - - var serializer = _serializers.serializerForType(String); - var data = _serializers.deserializeWith(serializer, response.data); - - return Response( - data: data, - headers: response.headers, - request: response.request, - redirects: response.redirects, - statusCode: response.statusCode, - statusMessage: response.statusMessage, - extra: response.extra, - ); - }); - } - /// Logs out current logged in user session - /// - /// - FuturelogoutUser({ CancelToken cancelToken, Map headers,}) async { - - String path = "/user/logout"; - - // query params - Map queryParams = {}; - Map headerParams = Map.from(headers ?? {}); - Map formParams = {}; - - queryParams.removeWhere((key, value) => value == null); - headerParams.removeWhere((key, value) => value == null); - formParams.removeWhere((key, value) => value == null); - - List contentTypes = []; - - - return _dio.request( - path, - queryParameters: queryParams, - options: Options( - method: 'get'.toUpperCase(), - headers: headerParams, - contentType: contentTypes.isNotEmpty ? contentTypes[0] : "application/json", - ), - cancelToken: cancelToken, - ); - } - /// Updated user - /// - /// This can only be done by the logged in user. - FutureupdateUser(String username,User body,{ CancelToken cancelToken, Map headers,}) async { - - String path = "/user/{username}".replaceAll("{" + "username" + "}", username.toString()); - - // query params - Map queryParams = {}; - Map headerParams = Map.from(headers ?? {}); - Map formParams = {}; - - queryParams.removeWhere((key, value) => value == null); - headerParams.removeWhere((key, value) => value == null); - formParams.removeWhere((key, value) => value == null); - - List contentTypes = []; - - var serializedBody = _serializers.serialize(body); - var jsonbody = json.encode(serializedBody); - - return _dio.request( - path, - queryParameters: queryParams, - data: jsonbody, - options: Options( - method: 'put'.toUpperCase(), - headers: headerParams, - contentType: contentTypes.isNotEmpty ? contentTypes[0] : "application/json", - ), - cancelToken: cancelToken, - ); - } - } + final Dio _dio; + Serializers _serializers; + + UserApi(this._dio, this._serializers); + + /// Create user + /// + /// This can only be done by the logged in user. + Future createUser( + User body, { + CancelToken cancelToken, + Map headers, + }) async { + String path = "/user"; + + // query params + Map queryParams = {}; + Map headerParams = Map.from(headers ?? {}); + Map formParams = {}; + + queryParams.removeWhere((key, value) => value == null); + headerParams.removeWhere((key, value) => value == null); + formParams.removeWhere((key, value) => value == null); + + List contentTypes = []; + + var serializedBody = _serializers.serialize(body); + var jsonbody = json.encode(serializedBody); + + return _dio.request( + path, + queryParameters: queryParams, + data: jsonbody, + options: Options( + method: 'post'.toUpperCase(), + headers: headerParams, + contentType: + contentTypes.isNotEmpty ? contentTypes[0] : "application/json", + ), + cancelToken: cancelToken, + ); + } + + /// Creates list of users with given input array + /// + /// + Future createUsersWithArrayInput( + List body, { + CancelToken cancelToken, + Map headers, + }) async { + String path = "/user/createWithArray"; + + // query params + Map queryParams = {}; + Map headerParams = Map.from(headers ?? {}); + Map formParams = {}; + + queryParams.removeWhere((key, value) => value == null); + headerParams.removeWhere((key, value) => value == null); + formParams.removeWhere((key, value) => value == null); + + List contentTypes = []; + + final type = const FullType(BuiltList, const [const FullType(User)]); + var serializedBody = + _serializers.serialize(BuiltList.from(body), specifiedType: type); + var jsonbody = json.encode(serializedBody); + + return _dio.request( + path, + queryParameters: queryParams, + data: jsonbody, + options: Options( + method: 'post'.toUpperCase(), + headers: headerParams, + contentType: + contentTypes.isNotEmpty ? contentTypes[0] : "application/json", + ), + cancelToken: cancelToken, + ); + } + + /// Creates list of users with given input array + /// + /// + Future createUsersWithListInput( + List body, { + CancelToken cancelToken, + Map headers, + }) async { + String path = "/user/createWithList"; + + // query params + Map queryParams = {}; + Map headerParams = Map.from(headers ?? {}); + Map formParams = {}; + + queryParams.removeWhere((key, value) => value == null); + headerParams.removeWhere((key, value) => value == null); + formParams.removeWhere((key, value) => value == null); + + List contentTypes = []; + + final type = const FullType(BuiltList, const [const FullType(User)]); + var serializedBody = + _serializers.serialize(BuiltList.from(body), specifiedType: type); + var jsonbody = json.encode(serializedBody); + + return _dio.request( + path, + queryParameters: queryParams, + data: jsonbody, + options: Options( + method: 'post'.toUpperCase(), + headers: headerParams, + contentType: + contentTypes.isNotEmpty ? contentTypes[0] : "application/json", + ), + cancelToken: cancelToken, + ); + } + + /// Delete user + /// + /// This can only be done by the logged in user. + Future deleteUser( + String username, { + CancelToken cancelToken, + Map headers, + }) async { + String path = "/user/{username}" + .replaceAll("{" + "username" + "}", username.toString()); + + // query params + Map queryParams = {}; + Map headerParams = Map.from(headers ?? {}); + Map formParams = {}; + + queryParams.removeWhere((key, value) => value == null); + headerParams.removeWhere((key, value) => value == null); + formParams.removeWhere((key, value) => value == null); + + List contentTypes = []; + + return _dio.request( + path, + queryParameters: queryParams, + options: Options( + method: 'delete'.toUpperCase(), + headers: headerParams, + contentType: + contentTypes.isNotEmpty ? contentTypes[0] : "application/json", + ), + cancelToken: cancelToken, + ); + } + + /// Get user by user name + /// + /// + Future> getUserByName( + String username, { + CancelToken cancelToken, + Map headers, + }) async { + String path = "/user/{username}" + .replaceAll("{" + "username" + "}", username.toString()); + + // query params + Map queryParams = {}; + Map headerParams = Map.from(headers ?? {}); + Map formParams = {}; + + queryParams.removeWhere((key, value) => value == null); + headerParams.removeWhere((key, value) => value == null); + formParams.removeWhere((key, value) => value == null); + + List contentTypes = []; + + return _dio + .request( + path, + queryParameters: queryParams, + options: Options( + method: 'get'.toUpperCase(), + headers: headerParams, + contentType: + contentTypes.isNotEmpty ? contentTypes[0] : "application/json", + ), + cancelToken: cancelToken, + ) + .then((response) { + var serializer = _serializers.serializerForType(User); + var data = _serializers.deserializeWith(serializer, response.data); + + return Response( + data: data, + headers: response.headers, + request: response.request, + redirects: response.redirects, + statusCode: response.statusCode, + statusMessage: response.statusMessage, + extra: response.extra, + ); + }); + } + + /// Logs user into the system + /// + /// + Future> loginUser( + String username, + String password, { + CancelToken cancelToken, + Map headers, + }) async { + String path = "/user/login"; + + // query params + Map queryParams = {}; + Map headerParams = Map.from(headers ?? {}); + Map formParams = {}; + + queryParams["username"] = username; + queryParams["password"] = password; + queryParams.removeWhere((key, value) => value == null); + headerParams.removeWhere((key, value) => value == null); + formParams.removeWhere((key, value) => value == null); + + List contentTypes = []; + + return _dio + .request( + path, + queryParameters: queryParams, + options: Options( + method: 'get'.toUpperCase(), + headers: headerParams, + contentType: + contentTypes.isNotEmpty ? contentTypes[0] : "application/json", + ), + cancelToken: cancelToken, + ) + .then((response) { + var serializer = _serializers.serializerForType(String); + var data = + _serializers.deserializeWith(serializer, response.data); + + return Response( + data: data, + headers: response.headers, + request: response.request, + redirects: response.redirects, + statusCode: response.statusCode, + statusMessage: response.statusMessage, + extra: response.extra, + ); + }); + } + + /// Logs out current logged in user session + /// + /// + Future logoutUser({ + CancelToken cancelToken, + Map headers, + }) async { + String path = "/user/logout"; + + // query params + Map queryParams = {}; + Map headerParams = Map.from(headers ?? {}); + Map formParams = {}; + + queryParams.removeWhere((key, value) => value == null); + headerParams.removeWhere((key, value) => value == null); + formParams.removeWhere((key, value) => value == null); + + List contentTypes = []; + + return _dio.request( + path, + queryParameters: queryParams, + options: Options( + method: 'get'.toUpperCase(), + headers: headerParams, + contentType: + contentTypes.isNotEmpty ? contentTypes[0] : "application/json", + ), + cancelToken: cancelToken, + ); + } + + /// Updated user + /// + /// This can only be done by the logged in user. + Future updateUser( + String username, + User body, { + CancelToken cancelToken, + Map headers, + }) async { + String path = "/user/{username}" + .replaceAll("{" + "username" + "}", username.toString()); + + // query params + Map queryParams = {}; + Map headerParams = Map.from(headers ?? {}); + Map formParams = {}; + + queryParams.removeWhere((key, value) => value == null); + headerParams.removeWhere((key, value) => value == null); + formParams.removeWhere((key, value) => value == null); + + List contentTypes = []; + + var serializedBody = _serializers.serialize(body); + var jsonbody = json.encode(serializedBody); + + return _dio.request( + path, + queryParameters: queryParams, + data: jsonbody, + options: Options( + method: 'put'.toUpperCase(), + headers: headerParams, + contentType: + contentTypes.isNotEmpty ? contentTypes[0] : "application/json", + ), + cancelToken: cancelToken, + ); + } +} diff --git a/samples/client/petstore/dart-dio/lib/model/api_response.dart b/samples/client/petstore/dart-dio/lib/model/api_response.dart index 955b4fa0432c..0feebafb0051 100644 --- a/samples/client/petstore/dart-dio/lib/model/api_response.dart +++ b/samples/client/petstore/dart-dio/lib/model/api_response.dart @@ -1,34 +1,24 @@ - import 'package:built_value/built_value.dart'; +import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; part 'api_response.g.dart'; abstract class ApiResponse implements Built { + @nullable + @BuiltValueField(wireName: 'code') + int get code; - - @nullable + @nullable + @BuiltValueField(wireName: 'type') + String get type; - - @BuiltValueField(wireName: 'code') - int get code; - - @nullable + @nullable + @BuiltValueField(wireName: 'message') + String get message; - - @BuiltValueField(wireName: 'type') - String get type; - - @nullable - - - @BuiltValueField(wireName: 'message') - String get message; - - // Boilerplate code needed to wire-up generated code - ApiResponse._(); - - factory ApiResponse([updates(ApiResponseBuilder b)]) = _$ApiResponse; - static Serializer get serializer => _$apiResponseSerializer; + // Boilerplate code needed to wire-up generated code + ApiResponse._(); + factory ApiResponse([updates(ApiResponseBuilder b)]) = _$ApiResponse; + static Serializer get serializer => _$apiResponseSerializer; } - diff --git a/samples/client/petstore/dart-dio/lib/model/category.dart b/samples/client/petstore/dart-dio/lib/model/category.dart index 0a908a259768..5d80fb503667 100644 --- a/samples/client/petstore/dart-dio/lib/model/category.dart +++ b/samples/client/petstore/dart-dio/lib/model/category.dart @@ -1,28 +1,20 @@ - import 'package:built_value/built_value.dart'; +import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; part 'category.g.dart'; abstract class Category implements Built { + @nullable + @BuiltValueField(wireName: 'id') + int get id; - - @nullable + @nullable + @BuiltValueField(wireName: 'name') + String get name; - - @BuiltValueField(wireName: 'id') - int get id; - - @nullable - - - @BuiltValueField(wireName: 'name') - String get name; - - // Boilerplate code needed to wire-up generated code - Category._(); - - factory Category([updates(CategoryBuilder b)]) = _$Category; - static Serializer get serializer => _$categorySerializer; + // Boilerplate code needed to wire-up generated code + Category._(); + factory Category([updates(CategoryBuilder b)]) = _$Category; + static Serializer get serializer => _$categorySerializer; } - diff --git a/samples/client/petstore/dart-dio/lib/model/order.dart b/samples/client/petstore/dart-dio/lib/model/order.dart index 72ce0c862486..c04e3032ce86 100644 --- a/samples/client/petstore/dart-dio/lib/model/order.dart +++ b/samples/client/petstore/dart-dio/lib/model/order.dart @@ -1,53 +1,39 @@ - import 'package:built_value/built_value.dart'; +import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; part 'order.g.dart'; abstract class Order implements Built { - - - @nullable - - - @BuiltValueField(wireName: 'id') - int get id; - - @nullable - - - @BuiltValueField(wireName: 'petId') - int get petId; - - @nullable - - - @BuiltValueField(wireName: 'quantity') - int get quantity; - - @nullable - - - @BuiltValueField(wireName: 'shipDate') - DateTime get shipDate; - /* Order Status */ - @nullable - - /* Order Status */ - @BuiltValueField(wireName: 'status') - String get status; - //enum statusEnum { placed, approved, delivered, }; - - @nullable - - - @BuiltValueField(wireName: 'complete') - bool get complete; - - // Boilerplate code needed to wire-up generated code - Order._(); - - factory Order([updates(OrderBuilder b)]) = _$Order; - static Serializer get serializer => _$orderSerializer; - + @nullable + @BuiltValueField(wireName: 'id') + int get id; + + @nullable + @BuiltValueField(wireName: 'petId') + int get petId; + + @nullable + @BuiltValueField(wireName: 'quantity') + int get quantity; + + @nullable + @BuiltValueField(wireName: 'shipDate') + DateTime get shipDate; + /* Order Status */ + @nullable + + /* Order Status */ + @BuiltValueField(wireName: 'status') + String get status; + //enum statusEnum { placed, approved, delivered, }; + + @nullable + @BuiltValueField(wireName: 'complete') + bool get complete; + + // Boilerplate code needed to wire-up generated code + Order._(); + + factory Order([updates(OrderBuilder b)]) = _$Order; + static Serializer get serializer => _$orderSerializer; } - diff --git a/samples/client/petstore/dart-dio/lib/model/pet.dart b/samples/client/petstore/dart-dio/lib/model/pet.dart index 8d86fb0ec20c..81441c4f6274 100644 --- a/samples/client/petstore/dart-dio/lib/model/pet.dart +++ b/samples/client/petstore/dart-dio/lib/model/pet.dart @@ -1,56 +1,42 @@ - import 'package:openapi/model/tag.dart'; - import 'package:openapi/model/category.dart'; - import 'package:built_collection/built_collection.dart'; - import 'package:built_value/built_value.dart'; +import 'package:openapi/model/tag.dart'; +import 'package:built_collection/built_collection.dart'; +import 'package:openapi/model/category.dart'; +import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; part 'pet.g.dart'; abstract class Pet implements Built { - - - @nullable - - - @BuiltValueField(wireName: 'id') - int get id; - - @nullable - - - @BuiltValueField(wireName: 'category') - Category get category; - - @nullable - - - @BuiltValueField(wireName: 'name') - String get name; - - @nullable - - - @BuiltValueField(wireName: 'photoUrls') - BuiltList get photoUrls; - - @nullable - - - @BuiltValueField(wireName: 'tags') - BuiltList get tags; - /* pet status in the store */ - @nullable - - /* pet status in the store */ - @BuiltValueField(wireName: 'status') - String get status; - //enum statusEnum { available, pending, sold, }; - - // Boilerplate code needed to wire-up generated code - Pet._(); - - factory Pet([updates(PetBuilder b)]) = _$Pet; - static Serializer get serializer => _$petSerializer; - + @nullable + @BuiltValueField(wireName: 'id') + int get id; + + @nullable + @BuiltValueField(wireName: 'category') + Category get category; + + @nullable + @BuiltValueField(wireName: 'name') + String get name; + + @nullable + @BuiltValueField(wireName: 'photoUrls') + BuiltList get photoUrls; + + @nullable + @BuiltValueField(wireName: 'tags') + BuiltList get tags; + /* pet status in the store */ + @nullable + + /* pet status in the store */ + @BuiltValueField(wireName: 'status') + String get status; + //enum statusEnum { available, pending, sold, }; + + // Boilerplate code needed to wire-up generated code + Pet._(); + + factory Pet([updates(PetBuilder b)]) = _$Pet; + static Serializer get serializer => _$petSerializer; } - diff --git a/samples/client/petstore/dart-dio/lib/model/tag.dart b/samples/client/petstore/dart-dio/lib/model/tag.dart index 88c06c47b9b4..9d304767721b 100644 --- a/samples/client/petstore/dart-dio/lib/model/tag.dart +++ b/samples/client/petstore/dart-dio/lib/model/tag.dart @@ -1,28 +1,20 @@ - import 'package:built_value/built_value.dart'; +import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; part 'tag.g.dart'; abstract class Tag implements Built { + @nullable + @BuiltValueField(wireName: 'id') + int get id; - - @nullable + @nullable + @BuiltValueField(wireName: 'name') + String get name; - - @BuiltValueField(wireName: 'id') - int get id; - - @nullable - - - @BuiltValueField(wireName: 'name') - String get name; - - // Boilerplate code needed to wire-up generated code - Tag._(); - - factory Tag([updates(TagBuilder b)]) = _$Tag; - static Serializer get serializer => _$tagSerializer; + // Boilerplate code needed to wire-up generated code + Tag._(); + factory Tag([updates(TagBuilder b)]) = _$Tag; + static Serializer get serializer => _$tagSerializer; } - diff --git a/samples/client/petstore/dart-dio/lib/model/user.dart b/samples/client/petstore/dart-dio/lib/model/user.dart index 953691a7ff90..da351b55d898 100644 --- a/samples/client/petstore/dart-dio/lib/model/user.dart +++ b/samples/client/petstore/dart-dio/lib/model/user.dart @@ -1,64 +1,46 @@ - import 'package:built_value/built_value.dart'; +import 'package:built_value/built_value.dart'; import 'package:built_value/serializer.dart'; part 'user.g.dart'; abstract class User implements Built { + @nullable + @BuiltValueField(wireName: 'id') + int get id; - - @nullable + @nullable + @BuiltValueField(wireName: 'username') + String get username; - - @BuiltValueField(wireName: 'id') - int get id; - - @nullable + @nullable + @BuiltValueField(wireName: 'firstName') + String get firstName; - - @BuiltValueField(wireName: 'username') - String get username; - - @nullable + @nullable + @BuiltValueField(wireName: 'lastName') + String get lastName; - - @BuiltValueField(wireName: 'firstName') - String get firstName; - - @nullable + @nullable + @BuiltValueField(wireName: 'email') + String get email; - - @BuiltValueField(wireName: 'lastName') - String get lastName; - - @nullable + @nullable + @BuiltValueField(wireName: 'password') + String get password; - - @BuiltValueField(wireName: 'email') - String get email; - - @nullable + @nullable + @BuiltValueField(wireName: 'phone') + String get phone; + /* User Status */ + @nullable - - @BuiltValueField(wireName: 'password') - String get password; - - @nullable + /* User Status */ + @BuiltValueField(wireName: 'userStatus') + int get userStatus; - - @BuiltValueField(wireName: 'phone') - String get phone; - /* User Status */ - @nullable - - /* User Status */ - @BuiltValueField(wireName: 'userStatus') - int get userStatus; - - // Boilerplate code needed to wire-up generated code - User._(); - - factory User([updates(UserBuilder b)]) = _$User; - static Serializer get serializer => _$userSerializer; + // Boilerplate code needed to wire-up generated code + User._(); + factory User([updates(UserBuilder b)]) = _$User; + static Serializer get serializer => _$userSerializer; } - diff --git a/samples/client/petstore/dart-dio/lib/serializers.dart b/samples/client/petstore/dart-dio/lib/serializers.dart index 9727613f0738..88a06193f3ca 100644 --- a/samples/client/petstore/dart-dio/lib/serializers.dart +++ b/samples/client/petstore/dart-dio/lib/serializers.dart @@ -11,41 +11,38 @@ import 'package:openapi/model/pet.dart'; import 'package:openapi/model/tag.dart'; import 'package:openapi/model/user.dart'; - part 'serializers.g.dart'; @SerializersFor(const [ -ApiResponse, -Category, -Order, -Pet, -Tag, -User, - + ApiResponse, + Category, + Order, + Pet, + Tag, + User, ]) //allow all models to be serialized within a list Serializers serializers = (_$serializers.toBuilder() -..addBuilderFactory( -const FullType(BuiltList, const [const FullType(ApiResponse)]), -() => new ListBuilder()) -..addBuilderFactory( -const FullType(BuiltList, const [const FullType(Category)]), -() => new ListBuilder()) -..addBuilderFactory( -const FullType(BuiltList, const [const FullType(Order)]), -() => new ListBuilder()) -..addBuilderFactory( -const FullType(BuiltList, const [const FullType(Pet)]), -() => new ListBuilder()) -..addBuilderFactory( -const FullType(BuiltList, const [const FullType(Tag)]), -() => new ListBuilder()) -..addBuilderFactory( -const FullType(BuiltList, const [const FullType(User)]), -() => new ListBuilder()) - -).build(); + ..addBuilderFactory( + const FullType(BuiltList, const [const FullType(ApiResponse)]), + () => new ListBuilder()) + ..addBuilderFactory( + const FullType(BuiltList, const [const FullType(Category)]), + () => new ListBuilder()) + ..addBuilderFactory( + const FullType(BuiltList, const [const FullType(Order)]), + () => new ListBuilder()) + ..addBuilderFactory( + const FullType(BuiltList, const [const FullType(Pet)]), + () => new ListBuilder()) + ..addBuilderFactory( + const FullType(BuiltList, const [const FullType(Tag)]), + () => new ListBuilder()) + ..addBuilderFactory( + const FullType(BuiltList, const [const FullType(User)]), + () => new ListBuilder())) + .build(); Serializers standardSerializers = -(serializers.toBuilder()..addPlugin(StandardJsonPlugin())).build(); \ No newline at end of file + (serializers.toBuilder()..addPlugin(StandardJsonPlugin())).build(); diff --git a/samples/client/petstore/dart-dio/pubspec.yaml b/samples/client/petstore/dart-dio/pubspec.yaml index b2d0d4d00ab7..2f3bd0e12556 100644 --- a/samples/client/petstore/dart-dio/pubspec.yaml +++ b/samples/client/petstore/dart-dio/pubspec.yaml @@ -5,9 +5,9 @@ environment: sdk: ">=2.3.0 <3.0.0" dependencies: dio: ^3.0.3 - built_value: 6.7.0 - built_collection: 4.2.2 + built_value: ^6.8.2 + built_collection: ^4.2.2 dev_dependencies: - built_value_generator: ^6.7.1 + built_value_generator: ^6.8.2 build_runner: ^1.7.1 test: 1.6.5 \ No newline at end of file