[Dart] Make clients crossplatform (#3608)

* Remove browserClient flag and bump http dependency * Run shell scripts so CIs can verify the change
OpenAPITools · Aug 13, 2019 · ba65f67 · ba65f67
1 parent 5e27f11
commit ba65f67
Show file tree

Hide file tree

Showing 15 changed files with 15 additions and 22 deletions.
diff --git a/modules/openapi-generator/src/main/resources/dart2/api_client.mustache b/modules/openapi-generator/src/main/resources/dart2/api_client.mustache
@@ -10,7 +10,7 @@ class QueryParam {
 class ApiClient {
 
   String basePath;
-  var client = {{#browserClient}}Browser{{/browserClient}}Client();
+  var client = Client();
 
   Map<String, String> _defaultHeaderMap = {};
   Map<String, Authentication> _authentications = {};

diff --git a/modules/openapi-generator/src/main/resources/dart2/apilib.mustache b/modules/openapi-generator/src/main/resources/dart2/apilib.mustache
@@ -1,8 +1,7 @@
 library {{pubName}}.api;
 
 import 'dart:async';
-import 'dart:convert';{{#browserClient}}
-import 'package:http/browser_client.dart';{{/browserClient}}
+import 'dart:convert';
 import 'package:http/http.dart';
 
 part 'api_client.dart';

diff --git a/modules/openapi-generator/src/main/resources/dart2/pubspec.mustache b/modules/openapi-generator/src/main/resources/dart2/pubspec.mustache
@@ -4,6 +4,6 @@ description: {{pubDescription}}
 environment:
   sdk: '>=2.0.0 <3.0.0'
 dependencies:
-  http: '>=0.11.1 <0.13.0'
+  http: '>=0.12.0 <0.13.0'
 dev_dependencies:
   test: ^1.3.0
diff --git a/samples/client/petstore/dart/flutter_petstore/openapi/.openapi-generator/VERSION b/samples/client/petstore/dart/flutter_petstore/openapi/.openapi-generator/VERSION
@@ -1 +1 @@
-4.1.0-SNAPSHOT
+4.1.1-SNAPSHOT
diff --git a/samples/client/petstore/dart/flutter_petstore/openapi/docs/PetApi.md b/samples/client/petstore/dart/flutter_petstore/openapi/docs/PetApi.md
@@ -151,7 +151,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)
 
 # **findPetsByTags**
-> List<Pet> findPetsByTags(tags, maxCount)
+> List<Pet> findPetsByTags(tags)
 
 Finds Pets by tags
 
@@ -165,10 +165,9 @@ import 'package:openapi/api.dart';
 
 var api_instance = PetApi();
 var tags = []; // List<String> | Tags to filter by
-var maxCount = 56; // int | Maximum number of items to return
 
 try { 
-    var result = api_instance.findPetsByTags(tags, maxCount);
+    var result = api_instance.findPetsByTags(tags);
     print(result);
 } catch (e) {
     print("Exception when calling PetApi->findPetsByTags: $e\n");
@@ -180,7 +179,6 @@ try {
 Name | Type | Description  | Notes
 ------------- | ------------- | ------------- | -------------
  **tags** | [**List&lt;String&gt;**](String.md)| Tags to filter by | [default to []]
- **maxCount** | **int**| Maximum number of items to return | [optional] [default to null]
 
 ### Return type
 

diff --git a/samples/client/petstore/dart/flutter_petstore/openapi/lib/api/pet_api.dart b/samples/client/petstore/dart/flutter_petstore/openapi/lib/api/pet_api.dart
@@ -160,7 +160,7 @@ class PetApi {
   /// 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, { int maxCount }) async {
+  Future<List<Pet>> findPetsByTags(List<String> tags) async {
     Object postBody;
 
     // verify required params are set
@@ -176,9 +176,6 @@ class PetApi {
     Map<String, String> headerParams = {};
     Map<String, String> formParams = {};
       queryParams.addAll(_convertParametersForCollectionFormat("csv", "tags", tags));
-    if(maxCount != null) {
-      queryParams.addAll(_convertParametersForCollectionFormat("", "maxCount", maxCount));
-    }
 
     List<String> contentTypes = [];
 

diff --git a/samples/client/petstore/dart/flutter_petstore/openapi/pubspec.yaml b/samples/client/petstore/dart/flutter_petstore/openapi/pubspec.yaml
@@ -4,6 +4,6 @@ description: OpenAPI API client
 environment:
   sdk: '>=2.0.0 <3.0.0'
 dependencies:
-  http: '>=0.11.1 <0.13.0'
+  http: '>=0.12.0 <0.13.0'
 dev_dependencies:
   test: ^1.3.0
diff --git a/samples/client/petstore/dart2/flutter_petstore/openapi/.openapi-generator/VERSION b/samples/client/petstore/dart2/flutter_petstore/openapi/.openapi-generator/VERSION
@@ -1 +1 @@
-4.1.0-SNAPSHOT
+4.1.1-SNAPSHOT
diff --git a/samples/client/petstore/dart2/flutter_petstore/openapi/pubspec.yaml b/samples/client/petstore/dart2/flutter_petstore/openapi/pubspec.yaml
@@ -4,6 +4,6 @@ description: OpenAPI API client
 environment:
   sdk: '>=2.0.0 <3.0.0'
 dependencies:
-  http: '>=0.11.1 <0.13.0'
+  http: '>=0.12.0 <0.13.0'
 dev_dependencies:
   test: ^1.3.0
diff --git a/samples/client/petstore/dart2/openapi-browser-client/.openapi-generator/VERSION b/samples/client/petstore/dart2/openapi-browser-client/.openapi-generator/VERSION
@@ -1 +1 @@
-4.1.0-SNAPSHOT
+4.1.1-SNAPSHOT
diff --git a/samples/client/petstore/dart2/openapi-browser-client/lib/api.dart b/samples/client/petstore/dart2/openapi-browser-client/lib/api.dart
@@ -2,7 +2,6 @@ library openapi.api;
 
 import 'dart:async';
 import 'dart:convert';
-import 'package:http/browser_client.dart';
 import 'package:http/http.dart';
 
 part 'api_client.dart';

diff --git a/samples/client/petstore/dart2/openapi-browser-client/lib/api_client.dart b/samples/client/petstore/dart2/openapi-browser-client/lib/api_client.dart
@@ -10,7 +10,7 @@ class QueryParam {
 class ApiClient {
 
   String basePath;
-  var client = BrowserClient();
+  var client = Client();
 
   Map<String, String> _defaultHeaderMap = {};
   Map<String, Authentication> _authentications = {};

diff --git a/samples/client/petstore/dart2/openapi-browser-client/pubspec.yaml b/samples/client/petstore/dart2/openapi-browser-client/pubspec.yaml
@@ -4,6 +4,6 @@ description: OpenAPI API client
 environment:
   sdk: '>=2.0.0 <3.0.0'
 dependencies:
-  http: '>=0.11.1 <0.13.0'
+  http: '>=0.12.0 <0.13.0'
 dev_dependencies:
   test: ^1.3.0
diff --git a/samples/client/petstore/dart2/openapi/.openapi-generator/VERSION b/samples/client/petstore/dart2/openapi/.openapi-generator/VERSION
@@ -1 +1 @@
-4.1.0-SNAPSHOT
+4.1.1-SNAPSHOT
diff --git a/samples/client/petstore/dart2/openapi/pubspec.yaml b/samples/client/petstore/dart2/openapi/pubspec.yaml
@@ -4,6 +4,6 @@ description: OpenAPI API client
 environment:
   sdk: '>=2.0.0 <3.0.0'
 dependencies:
-  http: '>=0.11.1 <0.13.0'
+  http: '>=0.12.0 <0.13.0'
 dev_dependencies:
   test: ^1.3.0