Fix CircleCI failures

An attempt to get CircleCi builds to succeed again.

GO

• remove wrong argument for go sample

Dart

• fixes following https://github.com/OpenAPITools/openapi-generator/pull/9392
• MultipartRequest(null, null) is no longer valid after http package upgrade
• fix petstore sample project not compiling
• disable live petstore tests
• use template to strip out unused code blocks

PR checklist

• Read the contribution guidelines.
• Pull Request title clearly describes the work in the pull request and Pull Request description provides details about how to validate the work. Missing information here may result in delayed response from the community.
• Run the following to build the project and update samples:

  ./mvnw clean package 
  ./bin/generate-samples.sh
  ./bin/utils/export_docs_generators.sh

  Commit all changed files. This is important, as CI jobs will verify all generator outputs of your HEAD commit as it would merge with master. These must match the expectations made by your contribution. You may regenerate an individual generator by passing the relevant config(s) as an argument to the script, for example ./bin/generate-samples.sh bin/configs/java*. For Windows users, please run the script in Git BASH.
• File the PR against the correct branch: master, 5.1.x, 6.0.x
• If your PR is targeting a particular programming language, @mention the technical committee members, so they are more likely to review the pull request.

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

@@ -99,39 +99,37 @@ class {{{classname}}} {
     final nullableContentType = contentTypes.isNotEmpty ? contentTypes[0] : null;
     final authNames = <String>[{{#authMethods}}'{{{name}}}'{{^-last}}, {{/-last}}{{/authMethods}}];
 
-    if (
-      nullableContentType != null &&
-      nullableContentType.toLowerCase().startsWith('multipart/form-data')
-    ) {
-      bool hasFields = false;
-      final mp = MultipartRequest(null, null);
-      {{#formParams}}
-      {{^isFile}}
-      if ({{{paramName}}} != null) {
-        hasFields = true;
-        mp.fields[r'{{{baseName}}}'] = parameterToString({{{paramName}}});
-      }
-      {{/isFile}}
-      {{#isFile}}
-      if ({{{paramName}}} != null) {
-        hasFields = true;
-        mp.fields[r'{{{baseName}}}'] = {{{paramName}}}.field;
-        mp.files.add({{{paramName}}});
-      }
-      {{/isFile}}
-      {{/formParams}}
-      if (hasFields) {
-        postBody = mp;
-      }
-    } else {
-      {{#formParams}}
-      {{^isFile}}
-      if ({{{paramName}}} != null) {
-        formParams[r'{{{baseName}}}'] = parameterToString({{{paramName}}});
-      }
-      {{/isFile}}
-      {{/formParams}}
+    {{#isMultipart}}
+    bool hasFields = false;
+    final mp = MultipartRequest('{{{httpMethod}}}', Uri.parse(path));
+    {{#formParams}}
+    {{^isFile}}
+    if ({{{paramName}}} != null) {
+      hasFields = true;
+      mp.fields[r'{{{baseName}}}'] = parameterToString({{{paramName}}});
+    }
+    {{/isFile}}
+    {{#isFile}}
+    if ({{{paramName}}} != null) {
+      hasFields = true;
+      mp.fields[r'{{{baseName}}}'] = {{{paramName}}}.field;
+      mp.files.add({{{paramName}}});
+    }
+    {{/isFile}}
+    {{/formParams}}
+    if (hasFields) {
+      postBody = mp;
+    }
+    {{/isMultipart}}
+    {{^isMultipart}}
+    {{#formParams}}
+    {{^isFile}}
+    if ({{{paramName}}} != null) {
+      formParams[r'{{{baseName}}}'] = parameterToString({{{paramName}}});
     }
+    {{/isFile}}
+    {{/formParams}}
+    {{/isMultipart}}
 
     return await apiClient.invokeAPI(
       path,

samples/openapi3/client/petstore/dart2/petstore/test/fake_client.dart

@@ -21,9 +21,9 @@ class FakeClient extends Fake implements Client {
     this.expectedPutRequestBody,
     this.putResponseBody,
     this.sendResponseBody,
-    this.expectedUrl,
+    String expectedUrl,
     this.expectedHeaders = null,
-  });
+  }) : this.expectedUrl = Uri.parse(expectedUrl);
 
   Exception throwException;
   Object expectedPostRequestBody;
@@ -34,12 +34,12 @@ class FakeClient extends Fake implements Client {
   String expectedPutRequestBody;
   String putResponseBody;
   String sendResponseBody;
-  String expectedUrl;
+  Uri expectedUrl;
   Map<String, String> expectedHeaders;
 
   @override
-  Future<Response> post(url,
-      {Map<String, String> headers, body, Encoding encoding}) async {
+  Future<Response> post(Uri url,
+      {Map<String, String> headers, Object body, Encoding encoding}) async {
     // check that the request was made with expected values
     if (url != expectedUrl) {
       throw StateError(
@@ -67,7 +67,7 @@ class FakeClient extends Fake implements Client {
   }
 
   @override
-  Future<Response> get(url, {Map<String, String> headers}) async {
+  Future<Response> get(Uri url, {Map<String, String> headers}) async {
     // check that the request was made with expected values
     if (url != expectedUrl) {
       throw StateError(
@@ -85,7 +85,8 @@ class FakeClient extends Fake implements Client {
   }
 
   @override
-  Future<Response> delete(url, {Map<String, String> headers}) async {
+  Future<Response> delete(Uri url,
+      {Map<String, String> headers, Object body, Encoding encoding}) async {
     // check that the request was made with expected values
     if (url != expectedUrl) {
       throw StateError(
@@ -103,8 +104,8 @@ class FakeClient extends Fake implements Client {
   }
 
   @override
-  Future<Response> put(url,
-      {Map<String, String> headers, body, Encoding encoding}) async {
+  Future<Response> put(Uri url,
+      {Map<String, String> headers, Object body, Encoding encoding}) async {
     // check that the request was made with expected values
     if (url != expectedUrl) {
       throw StateError(

samples/openapi3/client/petstore/dart2/petstore/test/order_model_test.dart

@@ -2,8 +2,8 @@ import 'package:openapi/api.dart';
 import 'package:test/test.dart';
 
 void main() {
-    test('Check if default value is generated', () async {
-      var order = Order();
-      expect(order.complete, equals(false));
-    });
+  test('Check if default value is generated', () async {
+    var order = Order();
+    expect(order.complete, equals(false));
+  });
 }

samples/openapi3/client/petstore/dart2/petstore/test/pet_faked_client_test.dart

@@ -26,11 +26,10 @@ void main() {
         ..id = 124321
         ..name = 'Jose'
     ];
-    return Pet()
+    return Pet(name: name)
       ..id = id
       ..category = category
       ..tags = tags
-      ..name = name
       ..status = PetStatusEnum.fromJson(status)
       ..photoUrls = ['https://petstore.com/sample/photo1.jpg'];
   }
@@ -53,8 +52,7 @@ void main() {
       // use the pet api to add a pet
       petApi.apiClient.client = FakeClient(
           expectedUrl: 'http://petstore.swagger.io/v2/pet',
-          expectedPostRequestBody:
-              await petApi.apiClient.serializeAsync(newPet),
+          expectedPostRequestBody: await petApi.apiClient.serializeAsync(newPet),
           postResponseBody: await petApi.apiClient.serializeAsync(newPet),
           expectedHeaders: {'Content-Type': 'application/json'});
       await petApi.addPet(newPet);
@@ -76,8 +74,7 @@ void main() {
         expectedUrl: 'http://petstore.swagger.io/v2/pet/$id',
         throwException: ApiException(400, 'not found'),
       );
-      expect(
-          petApi.getPetById(id), throwsA(equals(TypeMatcher<ApiException>())));
+      expect(petApi.getPetById(id), throwsA(equals(TypeMatcher<ApiException>())));
     });
 
     test('deletes existing pet by id', () async {
@@ -87,8 +84,7 @@ void main() {
       // add a new pet
       petApi.apiClient.client = FakeClient(
           expectedUrl: 'http://petstore.swagger.io/v2/pet',
-          expectedPostRequestBody:
-              await petApi.apiClient.serializeAsync(newPet),
+          expectedPostRequestBody: await petApi.apiClient.serializeAsync(newPet),
           postResponseBody: await petApi.apiClient.serializeAsync(newPet),
           expectedHeaders: {'Content-Type': 'application/json'});
       await petApi.addPet(newPet);
@@ -106,8 +102,7 @@ void main() {
         expectedUrl: 'http://petstore.swagger.io/v2/pet/$id',
         throwException: ApiException(400, 'Not found'),
       );
-      expect(
-          petApi.getPetById(id), throwsA(equals(TypeMatcher<ApiException>())));
+      expect(petApi.getPetById(id), throwsA(equals(TypeMatcher<ApiException>())));
     });
 
     test('updates pet with form', () async {
@@ -117,16 +112,11 @@ void main() {
       // add a new pet
       petApi.apiClient.client = FakeClient(
           expectedUrl: 'http://petstore.swagger.io/v2/pet',
-          expectedPostRequestBody:
-              await petApi.apiClient.serializeAsync(newPet),
+          expectedPostRequestBody: await petApi.apiClient.serializeAsync(newPet),
           postResponseBody: await petApi.apiClient.serializeAsync(newPet),
           expectedHeaders: {'Content-Type': 'application/json'});
       await petApi.addPet(newPet);
 
-      final multipartRequest = MultipartRequest(null, null);
-      multipartRequest.fields['name'] = 'Doge';
-      multipartRequest.fields['status'] = '';
-
       // update with form
       petApi.apiClient.client = FakeClient(
         expectedUrl: 'http://petstore.swagger.io/v2/pet/$id',
@@ -157,8 +147,7 @@ void main() {
       // add a new pet
       petApi.apiClient.client = FakeClient(
           expectedUrl: 'http://petstore.swagger.io/v2/pet',
-          expectedPostRequestBody:
-              await petApi.apiClient.serializeAsync(newPet),
+          expectedPostRequestBody: await petApi.apiClient.serializeAsync(newPet),
           postResponseBody: await petApi.apiClient.serializeAsync(newPet),
           expectedHeaders: {'Content-Type': 'application/json'});
       await petApi.addPet(newPet);
@@ -166,8 +155,7 @@ void main() {
       // update the same pet
       petApi.apiClient.client = FakeClient(
           expectedUrl: 'http://petstore.swagger.io/v2/pet',
-          expectedPutRequestBody:
-              await petApi.apiClient.serializeAsync(updatePet),
+          expectedPutRequestBody: await petApi.apiClient.serializeAsync(updatePet),
           putResponseBody: await petApi.apiClient.serializeAsync(updatePet),
           expectedHeaders: {'Content-Type': 'application/json'});
       await petApi.updatePet(updatePet);
@@ -196,15 +184,13 @@ void main() {
 
       // retrieve pets by status
       petApi.apiClient.client = FakeClient(
-        expectedUrl:
-            'http://petstore.swagger.io/v2/pet/findByStatus?status=$status',
+        expectedUrl: 'http://petstore.swagger.io/v2/pet/findByStatus?status=$status',
         getResponseBody: await petApi.apiClient.serializeAsync([pet1, pet2]),
       );
       final pets = await petApi.findPetsByStatus([status]);
 
       // tests serialisation and deserialisation of enum
-      final petsByStatus =
-          pets.where((p) => p.status == PetStatusEnum.available);
+      final petsByStatus = pets.where((p) => p.status == PetStatusEnum.available);
       expect(petsByStatus.length, equals(2));
       final petIds = pets.map((pet) => pet.id).toList();
       expect(petIds, contains(id1));
@@ -216,14 +202,12 @@ void main() {
       final id = newId();
       final newPet = makePet(id: id);
       // get some test data (recorded from live response)
-      final uploadResponse =
-          await File('test/file_upload_response.json').readAsString();
+      final uploadResponse = await File('test/file_upload_response.json').readAsString();
 
       // add a new pet
       petApi.apiClient.client = FakeClient(
           expectedUrl: 'http://petstore.swagger.io/v2/pet',
-          expectedPostRequestBody:
-              await petApi.apiClient.serializeAsync(newPet),
+          expectedPostRequestBody: await petApi.apiClient.serializeAsync(newPet),
           postResponseBody: await petApi.apiClient.serializeAsync(newPet),
           expectedHeaders: {'Content-Type': 'application/json'});
       await petApi.addPet(newPet);
@@ -232,9 +216,8 @@ void main() {
         expectedUrl: 'http://petstore.swagger.io/v2/pet',
         sendResponseBody: uploadResponse,
       );
-      final file =
-          new MultipartFile.fromBytes('file', [104, 101, 108, 108, 111]);
-      await petApi.uploadFile(id, additionalMetadata: '', file: file);
+      final file = new MultipartFile.fromBytes('file', [104, 101, 108, 108, 111]);
+      await petApi.uploadFile(id, file: file);
     });
   });
 }

samples/openapi3/client/petstore/dart2/petstore/test/pet_test.dart

-import 'dart:async';
-
+@Skip('Needs real petstore')
 import 'package:http/http.dart';
 import 'package:openapi/api.dart';
 import 'package:test/test.dart';
@@ -46,16 +45,14 @@ void main() {
     });
 
     test('doesn\'t get non-existing pet by id', () {
-      expect(petApi.getPetById(newId()),
-          throwsA(equals(TypeMatcher<ApiException>())));
+      expect(petApi.getPetById(newId()), throwsA(equals(TypeMatcher<ApiException>())));
     });
 
     test('deletes existing pet by id', () async {
       var id = newId();
       await petApi.addPet(makePet(id: id));
       await petApi.deletePet(id, apiKey: 'special-key');
-      expect(
-          petApi.getPetById(id), throwsA(equals(TypeMatcher<ApiException>())));
+      expect(petApi.getPetById(id), throwsA(equals(TypeMatcher<ApiException>())));
     });
 
     test('updates pet with form', () async {
@@ -100,5 +97,5 @@ void main() {
       var file = new MultipartFile.fromBytes('file', [104, 101, 108, 108, 111]);
       await petApi.uploadFile(id, additionalMetadata: '', file: file);
     });
-  }, skip: 'e2e tests for CI');
+  });
 }