[go] Serialize multipart array of complex objects as JSON (#2965)

* Serialize multipart array of complex objects as JSON

* Update sample client

* Update sample client

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

@@ -203,9 +203,20 @@ func (a *{{{classname}}}Service) {{{nickname}}}(ctx context.Context{{#hasParams}
 	localVarFormParams.Add("{{baseName}}", parameterToString({{paramName}}, "{{#collectionFormat}}{{collectionFormat}}{{/collectionFormat}}"))
 {{/required}}
 {{^required}}
+{{#isModel}}
+	if localVarOptionals != nil && localVarOptionals.{{vendorExtensions.x-exportParamName}}.IsSet() {
+		paramJson, err := parameterToJson(localVarOptionals.{{vendorExtensions.x-exportParamName}}.Value())
+		if err != nil {
+			return {{#returnType}}localVarReturnValue, {{/returnType}}nil, err
+		}
+		localVarFormParams.Add("{{baseName}}", paramJson)
+	}
+{{/isModel}}
+{{^isModel}}
 	if localVarOptionals != nil && localVarOptionals.{{vendorExtensions.x-exportParamName}}.IsSet() {
 		localVarFormParams.Add("{{baseName}}", parameterToString(localVarOptionals.{{vendorExtensions.x-exportParamName}}.Value(), "{{#collectionFormat}}{{collectionFormat}}{{/collectionFormat}}"))
 	}
+{{/isModel}}
 {{/required}}
 {{/isFile}}
 {{/formParams}}

modules/openapi-generator/src/main/resources/go/client.mustache

@@ -149,6 +149,16 @@ func parameterToString(obj interface{}, collectionFormat string) string {
 	return fmt.Sprintf("%v", obj)
 }
 
+// helper for converting interface{} parameters to json strings
+func parameterToJson(obj interface{}) (string, error) {
+	jsonBuf, err := json.Marshal(obj)
+	if err != nil {
+		return "", err
+	}
+	return string(jsonBuf), err
+}
+
+
 // callAPI do the request.
 func (c *APIClient) callAPI(request *http.Request) (*http.Response, error) {
 	return c.cfg.HTTPClient.Do(request)

samples/client/petstore/go/go-petstore-withXml/api_fake.go

@@ -833,7 +833,11 @@ func (a *FakeApiService) TestEndpointParameters(ctx context.Context, number floa
 		localVarFormParams.Add("date", parameterToString(localVarOptionals.Date.Value(), ""))
 	}
 	if localVarOptionals != nil && localVarOptionals.DateTime.IsSet() {
-		localVarFormParams.Add("dateTime", parameterToString(localVarOptionals.DateTime.Value(), ""))
+		paramJson, err := parameterToJson(localVarOptionals.DateTime.Value())
+		if err != nil {
+			return nil, err
+		}
+		localVarFormParams.Add("dateTime", paramJson)
 	}
 	if localVarOptionals != nil && localVarOptionals.Password.IsSet() {
 		localVarFormParams.Add("password", parameterToString(localVarOptionals.Password.Value(), ""))

samples/client/petstore/go/go-petstore-withXml/client.go

@@ -161,6 +161,16 @@ func parameterToString(obj interface{}, collectionFormat string) string {
 	return fmt.Sprintf("%v", obj)
 }
 
+// helper for converting interface{} parameters to json strings
+func parameterToJson(obj interface{}) (string, error) {
+	jsonBuf, err := json.Marshal(obj)
+	if err != nil {
+		return "", err
+	}
+	return string(jsonBuf), err
+}
+
+
 // callAPI do the request.
 func (c *APIClient) callAPI(request *http.Request) (*http.Response, error) {
 	return c.cfg.HTTPClient.Do(request)

samples/client/petstore/go/go-petstore/api_fake.go

@@ -832,7 +832,11 @@ func (a *FakeApiService) TestEndpointParameters(ctx context.Context, number floa
 		localVarFormParams.Add("date", parameterToString(localVarOptionals.Date.Value(), ""))
 	}
 	if localVarOptionals != nil && localVarOptionals.DateTime.IsSet() {
-		localVarFormParams.Add("dateTime", parameterToString(localVarOptionals.DateTime.Value(), ""))
+		paramJson, err := parameterToJson(localVarOptionals.DateTime.Value())
+		if err != nil {
+			return nil, err
+		}
+		localVarFormParams.Add("dateTime", paramJson)
 	}
 	if localVarOptionals != nil && localVarOptionals.Password.IsSet() {
 		localVarFormParams.Add("password", parameterToString(localVarOptionals.Password.Value(), ""))

samples/client/petstore/go/go-petstore/client.go

@@ -160,6 +160,16 @@ func parameterToString(obj interface{}, collectionFormat string) string {
 	return fmt.Sprintf("%v", obj)
 }
 
+// helper for converting interface{} parameters to json strings
+func parameterToJson(obj interface{}) (string, error) {
+	jsonBuf, err := json.Marshal(obj)
+	if err != nil {
+		return "", err
+	}
+	return string(jsonBuf), err
+}
+
+
 // callAPI do the request.
 func (c *APIClient) callAPI(request *http.Request) (*http.Response, error) {
 	return c.cfg.HTTPClient.Do(request)

samples/openapi3/client/petstore/go/go-petstore/.openapi-generator/VERSION

@@ -1 +1 @@
-4.0.2-SNAPSHOT
+4.0.3-SNAPSHOT

samples/openapi3/client/petstore/go/go-petstore/api_fake.go

@@ -849,7 +849,11 @@ func (a *FakeApiService) TestEndpointParameters(ctx context.Context, number floa
 		localVarFormParams.Add("date", parameterToString(localVarOptionals.Date.Value(), ""))
 	}
 	if localVarOptionals != nil && localVarOptionals.DateTime.IsSet() {
-		localVarFormParams.Add("dateTime", parameterToString(localVarOptionals.DateTime.Value(), ""))
+		paramJson, err := parameterToJson(localVarOptionals.DateTime.Value())
+		if err != nil {
+			return nil, err
+		}
+		localVarFormParams.Add("dateTime", paramJson)
 	}
 	if localVarOptionals != nil && localVarOptionals.Password.IsSet() {
 		localVarFormParams.Add("password", parameterToString(localVarOptionals.Password.Value(), ""))

samples/openapi3/client/petstore/go/go-petstore/client.go

@@ -163,6 +163,16 @@ func parameterToString(obj interface{}, collectionFormat string) string {
 	return fmt.Sprintf("%v", obj)
 }
 
+// helper for converting interface{} parameters to json strings
+func parameterToJson(obj interface{}) (string, error) {
+	jsonBuf, err := json.Marshal(obj)
+	if err != nil {
+		return "", err
+	}
+	return string(jsonBuf), err
+}
+
+
 // callAPI do the request.
 func (c *APIClient) callAPI(request *http.Request) (*http.Response, error) {
 	return c.cfg.HTTPClient.Do(request)