Merge branch 'main' into fix-hashmap-serialization-in-json

twilio · Nov 14, 2023 · 600d2d5 · 600d2d5
2 parents 4234091 + d463d8f
commit 600d2d5
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 5 deletions.
diff --git a/examples/go/go-client/helper/rest/api/v2010/accounts.go b/examples/go/go-client/helper/rest/api/v2010/accounts.go
@@ -74,7 +74,6 @@ func (c *ApiService) CreateAccount(params *CreateAccountParams) (*TestResponseOb
 	if params != nil && params.XTwilioWebhookEnabled != nil {
 		headers["X-Twilio-Webhook-Enabled"] = *params.XTwilioWebhookEnabled
 	}
-
 	resp, err := c.requestHandler.Post(c.baseURL+path, data, headers)
 	if err != nil {
 		return nil, err

diff --git a/src/main/resources/twilio-go/api.mustache b/src/main/resources/twilio-go/api.mustache
@@ -47,8 +47,17 @@ func (c *ApiService) {{{nickname}}}({{#allParams}}{{#required}}{{paramName}} {{{
 	}
 {{/headerParams}}
 {{/hasHeaderParams}}
-
+{{#vendorExtensions.x-is-create-operation}}
+{{#vendorExtensions.x-is-json-type}}
+    resp, err := c.requestHandler.{{httpMethod}}(c.baseURL+path, data, headers, body...)
+{{/vendorExtensions.x-is-json-type}}
+{{^vendorExtensions.x-is-json-type}}
+    resp, err := c.requestHandler.{{httpMethod}}(c.baseURL+path, data, headers)
+{{/vendorExtensions.x-is-json-type}}
+{{/vendorExtensions.x-is-create-operation}}
+{{^vendorExtensions.x-is-create-operation}}
     resp, err := c.requestHandler.{{httpMethod}}(c.baseURL+path, data, headers)
+{{/vendorExtensions.x-is-create-operation}}
 {{#returnType}}
     if err != nil {
         return nil, err

diff --git a/src/main/resources/twilio-go/partial_serialization.mustache b/src/main/resources/twilio-go/partial_serialization.mustache
@@ -24,13 +24,13 @@ if params != nil && params.PathAccountSid != nil {
 {{#hasOptionalParams}}
 {{#optionalParams}}
 {{#vendorExtensions.x-is-body-param}}
+    body := []byte{}
     if params != nil && params.{{paramName}} != nil {
-        v, err := json.Marshal(*params.{{paramName}})
+        b, err := json.Marshal(*params.{{paramName}})
         if err != nil {
             return nil, err
         }
-        urlEncodedData := url.QueryEscape(string(v))
-        data.Set("{{baseName}}", urlEncodedData)
+        body = b
     }
 {{/vendorExtensions.x-is-body-param}}
 {{^vendorExtensions.x-is-body-param}}