loafle/openapi-generator
3
0
Fork 0
forked from loafle/openapi-generator-original
Code Pull Requests Activity

upgrade dart generator dependencies (#9392)

Browse Source 
* upgrade intl package

* upgrade http package and change url to uri

* update petstore sample

* update pubspec files

* upgrade http dependency

* upgrade dev dependencies

* update json_serializable and test

* delete nullable - deprecated on json_serializable 4.1.1

* fixed NNBD issue

* change test version
This commit is contained in:
Adi1231234 2021-05-10 11:07:03 +03:00 committed by GitHub
parent 85c43e731b
commit 1961c661f3
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
10 changed files with 54 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
modules/openapi-generator/src/main/resources/dart2/api_client.mustache vendored
View File

@ -84,7 +84,7 @@ class ApiClient {
? '?${urlEncodedQueryParams.join('&')}' ? '?${urlEncodedQueryParams.join('&')}'
: ''; : '';
final url = '$basePath$path$queryString'; final Uri uri = Uri.parse('$basePath$path$queryString');
if (nullableContentType != null) { if (nullableContentType != null) {
headerParams['Content-Type'] = nullableContentType; headerParams['Content-Type'] = nullableContentType;
@ -96,7 +96,7 @@ class ApiClient {
body is MultipartFile && (nullableContentType == null || body is MultipartFile && (nullableContentType == null ||
!nullableContentType.toLowerCase().startsWith('multipart/form-data')) !nullableContentType.toLowerCase().startsWith('multipart/form-data'))
) { ) {
final request = StreamedRequest(method, Uri.parse(url)); final request = StreamedRequest(method, uri);
request.headers.addAll(headerParams); request.headers.addAll(headerParams);
request.contentLength = body.length; request.contentLength = body.length;
body.finalize().listen( body.finalize().listen(
@ -110,7 +110,7 @@ class ApiClient {
} }
if (body is MultipartRequest) { if (body is MultipartRequest) {
final request = MultipartRequest(method, Uri.parse(url)); final request = MultipartRequest(method, uri);
request.fields.addAll(body.fields); request.fields.addAll(body.fields);
request.files.addAll(body.files); request.files.addAll(body.files);
request.headers.addAll(body.headers); request.headers.addAll(body.headers);
@ -125,12 +125,12 @@ class ApiClient {
final nullableHeaderParams = headerParams.isEmpty ? null : headerParams; final nullableHeaderParams = headerParams.isEmpty ? null : headerParams;
switch(method) { switch(method) {
case 'POST': return await _client.post(url, headers: nullableHeaderParams, body: msgBody,); case 'POST': return await _client.post(uri, headers: nullableHeaderParams, body: msgBody,);
case 'PUT': return await _client.put(url, headers: nullableHeaderParams, body: msgBody,); case 'PUT': return await _client.put(uri, headers: nullableHeaderParams, body: msgBody,);
case 'DELETE': return await _client.delete(url, headers: nullableHeaderParams,); case 'DELETE': return await _client.delete(uri, headers: nullableHeaderParams,);
case 'PATCH': return await _client.patch(url, headers: nullableHeaderParams, body: msgBody,); case 'PATCH': return await _client.patch(uri, headers: nullableHeaderParams, body: msgBody,);
case 'HEAD': return await _client.head(url, headers: nullableHeaderParams,); case 'HEAD': return await _client.head(uri, headers: nullableHeaderParams,);
case 'GET': return await _client.get(url, headers: nullableHeaderParams,); case 'GET': return await _client.get(uri, headers: nullableHeaderParams,);
} }
} on SocketException catch (e, trace) { } on SocketException catch (e, trace) {
throw ApiException.withInner(HttpStatus.badRequest, 'Socket operation failed: $method $path', e, trace,); throw ApiException.withInner(HttpStatus.badRequest, 'Socket operation failed: $method $path', e, trace,);

1
modules/openapi-generator/src/main/resources/dart2/build.yaml.mustache vendored
View File

@ -16,4 +16,3 @@ targets:
field_rename: none field_rename: none
ignore_unannotated: false ignore_unannotated: false
include_if_null: false include_if_null: false
nullable: true

10
modules/openapi-generator/src/main/resources/dart2/pubspec.mustache vendored
View File

@ -9,15 +9,15 @@ authors:
- '{{{pubAuthor}}} <{{{pubAuthorEmail}}}>' - '{{{pubAuthor}}} <{{{pubAuthorEmail}}}>'
homepage: '{{{pubHomepage}}}' homepage: '{{{pubHomepage}}}'
environment: environment:
sdk: '>=2.0.0 <3.0.0' sdk: '>=2.12.0 <3.0.0'
dependencies: dependencies:
http: '>=0.12.0 <0.13.0' http: '>=0.13.0 <0.14.0'
intl: '^0.16.1' intl: '^0.17.0'
meta: '^1.1.8' meta: '^1.1.8'
{{#json_serializable}} {{#json_serializable}}
json_annotation: '^3.1.1'{{/json_serializable}} json_annotation: '^3.1.1'{{/json_serializable}}
dev_dependencies: dev_dependencies:
test: '>=1.3.0 <1.16.0' test: '>=1.16.0 <1.18.0'
{{#json_serializable}} {{#json_serializable}}
build_runner: '^1.0.0' build_runner: '^1.10.9'
json_serializable: '^3.5.1'{{/json_serializable}} json_serializable: '^3.5.1'{{/json_serializable}}

18
samples/openapi3/client/petstore/dart2/petstore_client_lib/lib/api_client.dart
View File

@ -77,7 +77,7 @@ class ApiClient {
? '?${urlEncodedQueryParams.join('&')}' ? '?${urlEncodedQueryParams.join('&')}'
: ''; : '';
final url = '$basePath$path$queryString'; final Uri uri = Uri.parse('$basePath$path$queryString');
if (nullableContentType != null) { if (nullableContentType != null) {
headerParams['Content-Type'] = nullableContentType; headerParams['Content-Type'] = nullableContentType;
@ -89,7 +89,7 @@ class ApiClient {
body is MultipartFile && (nullableContentType == null || body is MultipartFile && (nullableContentType == null ||
!nullableContentType.toLowerCase().startsWith('multipart/form-data')) !nullableContentType.toLowerCase().startsWith('multipart/form-data'))
) { ) {
final request = StreamedRequest(method, Uri.parse(url)); final request = StreamedRequest(method, uri);
request.headers.addAll(headerParams); request.headers.addAll(headerParams);
request.contentLength = body.length; request.contentLength = body.length;
body.finalize().listen( body.finalize().listen(
@ -103,7 +103,7 @@ class ApiClient {
} }
if (body is MultipartRequest) { if (body is MultipartRequest) {
final request = MultipartRequest(method, Uri.parse(url)); final request = MultipartRequest(method, uri);
request.fields.addAll(body.fields); request.fields.addAll(body.fields);
request.files.addAll(body.files); request.files.addAll(body.files);
request.headers.addAll(body.headers); request.headers.addAll(body.headers);
@ -118,12 +118,12 @@ class ApiClient {
final nullableHeaderParams = headerParams.isEmpty ? null : headerParams; final nullableHeaderParams = headerParams.isEmpty ? null : headerParams;
switch(method) { switch(method) {
case 'POST': return await _client.post(url, headers: nullableHeaderParams, body: msgBody,); case 'POST': return await _client.post(uri, headers: nullableHeaderParams, body: msgBody,);
case 'PUT': return await _client.put(url, headers: nullableHeaderParams, body: msgBody,); case 'PUT': return await _client.put(uri, headers: nullableHeaderParams, body: msgBody,);
case 'DELETE': return await _client.delete(url, headers: nullableHeaderParams,); case 'DELETE': return await _client.delete(uri, headers: nullableHeaderParams,);
case 'PATCH': return await _client.patch(url, headers: nullableHeaderParams, body: msgBody,); case 'PATCH': return await _client.patch(uri, headers: nullableHeaderParams, body: msgBody,);
case 'HEAD': return await _client.head(url, headers: nullableHeaderParams,); case 'HEAD': return await _client.head(uri, headers: nullableHeaderParams,);
case 'GET': return await _client.get(url, headers: nullableHeaderParams,); case 'GET': return await _client.get(uri, headers: nullableHeaderParams,);
} }
} on SocketException catch (e, trace) { } on SocketException catch (e, trace) {
throw ApiException.withInner(HttpStatus.badRequest, 'Socket operation failed: $method $path', e, trace,); throw ApiException.withInner(HttpStatus.badRequest, 'Socket operation failed: $method $path', e, trace,);

8
samples/openapi3/client/petstore/dart2/petstore_client_lib/pubspec.yaml
View File

@ -9,12 +9,12 @@ authors:
- 'Author <author@homepage>' - 'Author <author@homepage>'
homepage: 'homepage' homepage: 'homepage'
environment: environment:
sdk: '>=2.0.0 <3.0.0' sdk: '>=2.12.0 <3.0.0'
dependencies: dependencies:
http: '>=0.12.0 <0.13.0' http: '>=0.13.0 <0.14.0'
intl: '^0.16.1' intl: '^0.17.0'
meta: '^1.1.8' meta: '^1.1.8'
dev_dependencies: dev_dependencies:
test: '>=1.3.0 <1.16.0' test: '>=1.16.0 <1.18.0'

18
samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/lib/api_client.dart
View File

@ -80,7 +80,7 @@ class ApiClient {
? '?${urlEncodedQueryParams.join('&')}' ? '?${urlEncodedQueryParams.join('&')}'
: ''; : '';
final url = '$basePath$path$queryString'; final Uri uri = Uri.parse('$basePath$path$queryString');
if (nullableContentType != null) { if (nullableContentType != null) {
headerParams['Content-Type'] = nullableContentType; headerParams['Content-Type'] = nullableContentType;
@ -92,7 +92,7 @@ class ApiClient {
body is MultipartFile && (nullableContentType == null || body is MultipartFile && (nullableContentType == null ||
!nullableContentType.toLowerCase().startsWith('multipart/form-data')) !nullableContentType.toLowerCase().startsWith('multipart/form-data'))
) { ) {
final request = StreamedRequest(method, Uri.parse(url)); final request = StreamedRequest(method, uri);
request.headers.addAll(headerParams); request.headers.addAll(headerParams);
request.contentLength = body.length; request.contentLength = body.length;
body.finalize().listen( body.finalize().listen(
@ -106,7 +106,7 @@ class ApiClient {
} }
if (body is MultipartRequest) { if (body is MultipartRequest) {
final request = MultipartRequest(method, Uri.parse(url)); final request = MultipartRequest(method, uri);
request.fields.addAll(body.fields); request.fields.addAll(body.fields);
request.files.addAll(body.files); request.files.addAll(body.files);
request.headers.addAll(body.headers); request.headers.addAll(body.headers);
@ -121,12 +121,12 @@ class ApiClient {
final nullableHeaderParams = headerParams.isEmpty ? null : headerParams; final nullableHeaderParams = headerParams.isEmpty ? null : headerParams;
switch(method) { switch(method) {
case 'POST': return await _client.post(url, headers: nullableHeaderParams, body: msgBody,); case 'POST': return await _client.post(uri, headers: nullableHeaderParams, body: msgBody,);
case 'PUT': return await _client.put(url, headers: nullableHeaderParams, body: msgBody,); case 'PUT': return await _client.put(uri, headers: nullableHeaderParams, body: msgBody,);
case 'DELETE': return await _client.delete(url, headers: nullableHeaderParams,); case 'DELETE': return await _client.delete(uri, headers: nullableHeaderParams,);
case 'PATCH': return await _client.patch(url, headers: nullableHeaderParams, body: msgBody,); case 'PATCH': return await _client.patch(uri, headers: nullableHeaderParams, body: msgBody,);
case 'HEAD': return await _client.head(url, headers: nullableHeaderParams,); case 'HEAD': return await _client.head(uri, headers: nullableHeaderParams,);
case 'GET': return await _client.get(url, headers: nullableHeaderParams,); case 'GET': return await _client.get(uri, headers: nullableHeaderParams,);
} }
} on SocketException catch (e, trace) { } on SocketException catch (e, trace) {
throw ApiException.withInner(HttpStatus.badRequest, 'Socket operation failed: $method $path', e, trace,); throw ApiException.withInner(HttpStatus.badRequest, 'Socket operation failed: $method $path', e, trace,);

8
samples/openapi3/client/petstore/dart2/petstore_client_lib_fake/pubspec.yaml
View File

@ -9,12 +9,12 @@ authors:
- 'Author <author@homepage>' - 'Author <author@homepage>'
homepage: 'homepage' homepage: 'homepage'
environment: environment:
sdk: '>=2.0.0 <3.0.0' sdk: '>=2.12.0 <3.0.0'
dependencies: dependencies:
http: '>=0.12.0 <0.13.0' http: '>=0.13.0 <0.14.0'
intl: '^0.16.1' intl: '^0.17.0'
meta: '^1.1.8' meta: '^1.1.8'
dev_dependencies: dev_dependencies:
test: '>=1.3.0 <1.16.0' test: '>=1.16.0 <1.18.0'

1
samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/build.yaml
View File

@ -16,4 +16,3 @@ targets:
field_rename: none field_rename: none
ignore_unannotated: false ignore_unannotated: false
include_if_null: false include_if_null: false
nullable: true

18
samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/lib/api_client.dart
View File

@ -80,7 +80,7 @@ class ApiClient {
? '?${urlEncodedQueryParams.join('&')}' ? '?${urlEncodedQueryParams.join('&')}'
: ''; : '';
final url = '$basePath$path$queryString'; final Uri uri = Uri.parse('$basePath$path$queryString');
if (nullableContentType != null) { if (nullableContentType != null) {
headerParams['Content-Type'] = nullableContentType; headerParams['Content-Type'] = nullableContentType;
@ -92,7 +92,7 @@ class ApiClient {
body is MultipartFile && (nullableContentType == null || body is MultipartFile && (nullableContentType == null ||
!nullableContentType.toLowerCase().startsWith('multipart/form-data')) !nullableContentType.toLowerCase().startsWith('multipart/form-data'))
) { ) {
final request = StreamedRequest(method, Uri.parse(url)); final request = StreamedRequest(method, uri);
request.headers.addAll(headerParams); request.headers.addAll(headerParams);
request.contentLength = body.length; request.contentLength = body.length;
body.finalize().listen( body.finalize().listen(
@ -106,7 +106,7 @@ class ApiClient {
} }
if (body is MultipartRequest) { if (body is MultipartRequest) {
final request = MultipartRequest(method, Uri.parse(url)); final request = MultipartRequest(method, uri);
request.fields.addAll(body.fields); request.fields.addAll(body.fields);
request.files.addAll(body.files); request.files.addAll(body.files);
request.headers.addAll(body.headers); request.headers.addAll(body.headers);
@ -121,12 +121,12 @@ class ApiClient {
final nullableHeaderParams = headerParams.isEmpty ? null : headerParams; final nullableHeaderParams = headerParams.isEmpty ? null : headerParams;
switch(method) { switch(method) {
case 'POST': return await _client.post(url, headers: nullableHeaderParams, body: msgBody,); case 'POST': return await _client.post(uri, headers: nullableHeaderParams, body: msgBody,);
case 'PUT': return await _client.put(url, headers: nullableHeaderParams, body: msgBody,); case 'PUT': return await _client.put(uri, headers: nullableHeaderParams, body: msgBody,);
case 'DELETE': return await _client.delete(url, headers: nullableHeaderParams,); case 'DELETE': return await _client.delete(uri, headers: nullableHeaderParams,);
case 'PATCH': return await _client.patch(url, headers: nullableHeaderParams, body: msgBody,); case 'PATCH': return await _client.patch(uri, headers: nullableHeaderParams, body: msgBody,);
case 'HEAD': return await _client.head(url, headers: nullableHeaderParams,); case 'HEAD': return await _client.head(uri, headers: nullableHeaderParams,);
case 'GET': return await _client.get(url, headers: nullableHeaderParams,); case 'GET': return await _client.get(uri, headers: nullableHeaderParams,);
} }
} on SocketException catch (e, trace) { } on SocketException catch (e, trace) {
throw ApiException.withInner(HttpStatus.badRequest, 'Socket operation failed: $method $path', e, trace,); throw ApiException.withInner(HttpStatus.badRequest, 'Socket operation failed: $method $path', e, trace,);

10
samples/openapi3/client/petstore/dart2/petstore_json_serializable_client_lib_fake/pubspec.yaml
View File

@ -9,13 +9,13 @@ authors:
- 'Author <author@homepage>' - 'Author <author@homepage>'
homepage: 'homepage' homepage: 'homepage'
environment: environment:
sdk: '>=2.0.0 <3.0.0' sdk: '>=2.12.0 <3.0.0'
dependencies: dependencies:
http: '>=0.12.0 <0.13.0' http: '>=0.13.0 <0.14.0'
intl: '^0.16.1' intl: '^0.17.0'
meta: '^1.1.8' meta: '^1.1.8'
json_annotation: '^3.1.1' json_annotation: '^3.1.1'
dev_dependencies: dev_dependencies:
test: '>=1.3.0 <1.16.0' test: '>=1.16.0 <1.18.0'
build_runner: '^1.0.0' build_runner: '^1.10.9'
json_serializable: '^3.5.1' json_serializable: '^3.5.1'