google-api-go-client/all: Move nil media check to callers.

ConditionallyIncludeMedia does nothing if media is nil. Simplify by not calling this function if media is nil. Change-Id: I4657a0c5a7e02b78d28317b3bab94f713261ced9 Reviewed-on: https://code-review.googlesource.com/3976 Reviewed-by: Michael McGreevy <[email protected]>
lukmacodigo · Jan 7, 2016 · 77e7d38 · 77e7d38
1 parent 7285216
commit 77e7d38
Show file tree

Hide file tree

Showing 27 changed files with 104 additions and 107 deletions.
diff --git a/admin/email_migration/v2/admin-gen.go b/admin/email_migration/v2/admin-gen.go
@@ -231,8 +231,8 @@ func (c *MailInsertCall) doRequest(alt string) (*http.Response, error) {
  c.urlParams_.Set("uploadType", c.protocol_)
  }
  urls += "?" + c.urlParams_.Encode()
- if c.protocol_ != "resumable" {
- cancel := gensupport.ConditionallyIncludeMedia(c.media_, &body, &ctype)
+ if c.protocol_ != "resumable" && c.media_ != nil {
+ cancel := gensupport.IncludeMedia(c.media_, &body, &ctype)
  defer cancel()
  }
  req, _ := http.NewRequest("POST", urls, body)

diff --git a/analytics/v3/analytics-gen.go b/analytics/v3/analytics-gen.go
@@ -14548,8 +14548,8 @@ func (c *ManagementUploadsUploadDataCall) doRequest(alt string) (*http.Response,
  urls += "?" + c.urlParams_.Encode()
  body = new(bytes.Buffer)
  ctype := "application/json"
- if c.protocol_ != "resumable" {
- cancel := gensupport.ConditionallyIncludeMedia(c.media_, &body, &ctype)
+ if c.protocol_ != "resumable" && c.media_ != nil {
+ cancel := gensupport.IncludeMedia(c.media_, &body, &ctype)
  defer cancel()
  }
  req, _ := http.NewRequest("POST", urls, body)

diff --git a/androidpublisher/v2/androidpublisher-gen.go b/androidpublisher/v2/androidpublisher-gen.go
@@ -3454,8 +3454,8 @@ func (c *EditsApksUploadCall) doRequest(alt string) (*http.Response, error) {
  urls += "?" + c.urlParams_.Encode()
  body = new(bytes.Buffer)
  ctype := "application/json"
- if c.protocol_ != "resumable" {
- cancel := gensupport.ConditionallyIncludeMedia(c.media_, &body, &ctype)
+ if c.protocol_ != "resumable" && c.media_ != nil {
+ cancel := gensupport.IncludeMedia(c.media_, &body, &ctype)
  defer cancel()
  }
  req, _ := http.NewRequest("POST", urls, body)
@@ -4666,8 +4666,8 @@ func (c *EditsExpansionfilesUploadCall) doRequest(alt string) (*http.Response, e
  urls += "?" + c.urlParams_.Encode()
  body = new(bytes.Buffer)
  ctype := "application/json"
- if c.protocol_ != "resumable" {
- cancel := gensupport.ConditionallyIncludeMedia(c.media_, &body, &ctype)
+ if c.protocol_ != "resumable" && c.media_ != nil {
+ cancel := gensupport.IncludeMedia(c.media_, &body, &ctype)
  defer cancel()
  }
  req, _ := http.NewRequest("POST", urls, body)
@@ -5453,8 +5453,8 @@ func (c *EditsImagesUploadCall) doRequest(alt string) (*http.Response, error) {
  urls += "?" + c.urlParams_.Encode()
  body = new(bytes.Buffer)
  ctype := "application/json"
- if c.protocol_ != "resumable" {
- cancel := gensupport.ConditionallyIncludeMedia(c.media_, &body, &ctype)
+ if c.protocol_ != "resumable" && c.media_ != nil {
+ cancel := gensupport.IncludeMedia(c.media_, &body, &ctype)
  defer cancel()
  }
  req, _ := http.NewRequest("POST", urls, body)

diff --git a/bigquery/v2/bigquery-gen.go b/bigquery/v2/bigquery-gen.go
@@ -3641,8 +3641,8 @@ func (c *JobsInsertCall) doRequest(alt string) (*http.Response, error) {
  c.urlParams_.Set("uploadType", c.protocol_)
  }
  urls += "?" + c.urlParams_.Encode()
- if c.protocol_ != "resumable" {
- cancel := gensupport.ConditionallyIncludeMedia(c.media_, &body, &ctype)
+ if c.protocol_ != "resumable" && c.media_ != nil {
+ cancel := gensupport.IncludeMedia(c.media_, &body, &ctype)
  defer cancel()
  }
  req, _ := http.NewRequest("POST", urls, body)

diff --git a/dataproc/v1/dataproc-gen.go b/dataproc/v1/dataproc-gen.go
@@ -475,8 +475,8 @@ func (c *MediaUploadCall) doRequest(alt string) (*http.Response, error) {
  c.urlParams_.Set("uploadType", c.protocol_)
  }
  urls += "?" + c.urlParams_.Encode()
- if c.protocol_ != "resumable" {
- cancel := gensupport.ConditionallyIncludeMedia(c.media_, &body, &ctype)
+ if c.protocol_ != "resumable" && c.media_ != nil {
+ cancel := gensupport.IncludeMedia(c.media_, &body, &ctype)
  defer cancel()
  }
  req, _ := http.NewRequest("POST", urls, body)

diff --git a/dfareporting/v2.0/dfareporting-gen.go b/dfareporting/v2.0/dfareporting-gen.go
@@ -18270,8 +18270,8 @@ func (c *CreativeAssetsInsertCall) doRequest(alt string) (*http.Response, error)
  c.urlParams_.Set("uploadType", c.protocol_)
  }
  urls += "?" + c.urlParams_.Encode()
- if c.protocol_ != "resumable" {
- cancel := gensupport.ConditionallyIncludeMedia(c.media_, &body, &ctype)
+ if c.protocol_ != "resumable" && c.media_ != nil {
+ cancel := gensupport.IncludeMedia(c.media_, &body, &ctype)
  defer cancel()
  }
  req, _ := http.NewRequest("POST", urls, body)

diff --git a/dfareporting/v2.1/dfareporting-gen.go b/dfareporting/v2.1/dfareporting-gen.go
@@ -19769,8 +19769,8 @@ func (c *CreativeAssetsInsertCall) doRequest(alt string) (*http.Response, error)
  c.urlParams_.Set("uploadType", c.protocol_)
  }
  urls += "?" + c.urlParams_.Encode()
- if c.protocol_ != "resumable" {
- cancel := gensupport.ConditionallyIncludeMedia(c.media_, &body, &ctype)
+ if c.protocol_ != "resumable" && c.media_ != nil {
+ cancel := gensupport.IncludeMedia(c.media_, &body, &ctype)
  defer cancel()
  }
  req, _ := http.NewRequest("POST", urls, body)

diff --git a/dfareporting/v2.2/dfareporting-gen.go b/dfareporting/v2.2/dfareporting-gen.go
@@ -19793,8 +19793,8 @@ func (c *CreativeAssetsInsertCall) doRequest(alt string) (*http.Response, error)
  c.urlParams_.Set("uploadType", c.protocol_)
  }
  urls += "?" + c.urlParams_.Encode()
- if c.protocol_ != "resumable" {
- cancel := gensupport.ConditionallyIncludeMedia(c.media_, &body, &ctype)
+ if c.protocol_ != "resumable" && c.media_ != nil {
+ cancel := gensupport.IncludeMedia(c.media_, &body, &ctype)
  defer cancel()
  }
  req, _ := http.NewRequest("POST", urls, body)

diff --git a/dfareporting/v2.3/dfareporting-gen.go b/dfareporting/v2.3/dfareporting-gen.go
@@ -19813,8 +19813,8 @@ func (c *CreativeAssetsInsertCall) doRequest(alt string) (*http.Response, error)
  c.urlParams_.Set("uploadType", c.protocol_)
  }
  urls += "?" + c.urlParams_.Encode()
- if c.protocol_ != "resumable" {
- cancel := gensupport.ConditionallyIncludeMedia(c.media_, &body, &ctype)
+ if c.protocol_ != "resumable" && c.media_ != nil {
+ cancel := gensupport.IncludeMedia(c.media_, &body, &ctype)
  defer cancel()
  }
  req, _ := http.NewRequest("POST", urls, body)

diff --git a/drive/v1/drive-gen.go b/drive/v1/drive-gen.go
@@ -559,8 +559,8 @@ func (c *FilesInsertCall) doRequest(alt string) (*http.Response, error) {
  c.urlParams_.Set("uploadType", c.protocol_)
  }
  urls += "?" + c.urlParams_.Encode()
- if c.protocol_ != "resumable" {
- cancel := gensupport.ConditionallyIncludeMedia(c.media_, &body, &ctype)
+ if c.protocol_ != "resumable" && c.media_ != nil {
+ cancel := gensupport.IncludeMedia(c.media_, &body, &ctype)
  defer cancel()
  }
  req, _ := http.NewRequest("POST", urls, body)
@@ -989,8 +989,8 @@ func (c *FilesUpdateCall) doRequest(alt string) (*http.Response, error) {
  c.urlParams_.Set("uploadType", c.protocol_)
  }
  urls += "?" + c.urlParams_.Encode()
- if c.protocol_ != "resumable" {
- cancel := gensupport.ConditionallyIncludeMedia(c.media_, &body, &ctype)
+ if c.protocol_ != "resumable" && c.media_ != nil {
+ cancel := gensupport.IncludeMedia(c.media_, &body, &ctype)
  defer cancel()
  }
  req, _ := http.NewRequest("PUT", urls, body)

diff --git a/drive/v2/drive-gen.go b/drive/v2/drive-gen.go
@@ -5827,8 +5827,8 @@ func (c *FilesInsertCall) doRequest(alt string) (*http.Response, error) {
  c.urlParams_.Set("uploadType", c.protocol_)
  }
  urls += "?" + c.urlParams_.Encode()
- if c.protocol_ != "resumable" {
- cancel := gensupport.ConditionallyIncludeMedia(c.media_, &body, &ctype)
+ if c.protocol_ != "resumable" && c.media_ != nil {
+ cancel := gensupport.IncludeMedia(c.media_, &body, &ctype)
  defer cancel()
  }
  req, _ := http.NewRequest("POST", urls, body)
@@ -7194,8 +7194,8 @@ func (c *FilesUpdateCall) doRequest(alt string) (*http.Response, error) {
  c.urlParams_.Set("uploadType", c.protocol_)
  }
  urls += "?" + c.urlParams_.Encode()
- if c.protocol_ != "resumable" {
- cancel := gensupport.ConditionallyIncludeMedia(c.media_, &body, &ctype)
+ if c.protocol_ != "resumable" && c.media_ != nil {
+ cancel := gensupport.IncludeMedia(c.media_, &body, &ctype)
  defer cancel()
  }
  req, _ := http.NewRequest("PUT", urls, body)
@@ -10399,8 +10399,8 @@ func (c *RealtimeUpdateCall) doRequest(alt string) (*http.Response, error) {
  urls += "?" + c.urlParams_.Encode()
  body = new(bytes.Buffer)
  ctype := "application/json"
- if c.protocol_ != "resumable" {
- cancel := gensupport.ConditionallyIncludeMedia(c.media_, &body, &ctype)
+ if c.protocol_ != "resumable" && c.media_ != nil {
+ cancel := gensupport.IncludeMedia(c.media_, &body, &ctype)
  defer cancel()
  }
  req, _ := http.NewRequest("PUT", urls, body)

diff --git a/drive/v3/drive-gen.go b/drive/v3/drive-gen.go
@@ -3202,8 +3202,8 @@ func (c *FilesCreateCall) doRequest(alt string) (*http.Response, error) {
  c.urlParams_.Set("uploadType", c.protocol_)
  }
  urls += "?" + c.urlParams_.Encode()
- if c.protocol_ != "resumable" {
- cancel := gensupport.ConditionallyIncludeMedia(c.media_, &body, &ctype)
+ if c.protocol_ != "resumable" && c.media_ != nil {
+ cancel := gensupport.IncludeMedia(c.media_, &body, &ctype)
  defer cancel()
  }
  req, _ := http.NewRequest("POST", urls, body)
@@ -4379,8 +4379,8 @@ func (c *FilesUpdateCall) doRequest(alt string) (*http.Response, error) {
  c.urlParams_.Set("uploadType", c.protocol_)
  }
  urls += "?" + c.urlParams_.Encode()
- if c.protocol_ != "resumable" {
- cancel := gensupport.ConditionallyIncludeMedia(c.media_, &body, &ctype)
+ if c.protocol_ != "resumable" && c.media_ != nil {
+ cancel := gensupport.IncludeMedia(c.media_, &body, &ctype)
  defer cancel()
  }
  req, _ := http.NewRequest("PATCH", urls, body)

diff --git a/fusiontables/v1/fusiontables-gen.go b/fusiontables/v1/fusiontables-gen.go
@@ -3549,8 +3549,8 @@ func (c *TableImportRowsCall) doRequest(alt string) (*http.Response, error) {
  urls += "?" + c.urlParams_.Encode()
  body = new(bytes.Buffer)
  ctype := "application/json"
- if c.protocol_ != "resumable" {
- cancel := gensupport.ConditionallyIncludeMedia(c.media_, &body, &ctype)
+ if c.protocol_ != "resumable" && c.media_ != nil {
+ cancel := gensupport.IncludeMedia(c.media_, &body, &ctype)
  defer cancel()
  }
  req, _ := http.NewRequest("POST", urls, body)
@@ -3810,8 +3810,8 @@ func (c *TableImportTableCall) doRequest(alt string) (*http.Response, error) {
  urls += "?" + c.urlParams_.Encode()
  body = new(bytes.Buffer)
  ctype := "application/json"
- if c.protocol_ != "resumable" {
- cancel := gensupport.ConditionallyIncludeMedia(c.media_, &body, &ctype)
+ if c.protocol_ != "resumable" && c.media_ != nil {
+ cancel := gensupport.IncludeMedia(c.media_, &body, &ctype)
  defer cancel()
  }
  req, _ := http.NewRequest("POST", urls, body)

diff --git a/fusiontables/v2/fusiontables-gen.go b/fusiontables/v2/fusiontables-gen.go
@@ -3610,8 +3610,8 @@ func (c *TableImportRowsCall) doRequest(alt string) (*http.Response, error) {
  urls += "?" + c.urlParams_.Encode()
  body = new(bytes.Buffer)
  ctype := "application/json"
- if c.protocol_ != "resumable" {
- cancel := gensupport.ConditionallyIncludeMedia(c.media_, &body, &ctype)
+ if c.protocol_ != "resumable" && c.media_ != nil {
+ cancel := gensupport.IncludeMedia(c.media_, &body, &ctype)
  defer cancel()
  }
  req, _ := http.NewRequest("POST", urls, body)
@@ -3871,8 +3871,8 @@ func (c *TableImportTableCall) doRequest(alt string) (*http.Response, error) {
  urls += "?" + c.urlParams_.Encode()
  body = new(bytes.Buffer)
  ctype := "application/json"
- if c.protocol_ != "resumable" {
- cancel := gensupport.ConditionallyIncludeMedia(c.media_, &body, &ctype)
+ if c.protocol_ != "resumable" && c.media_ != nil {
+ cancel := gensupport.IncludeMedia(c.media_, &body, &ctype)
  defer cancel()
  }
  req, _ := http.NewRequest("POST", urls, body)
@@ -4570,8 +4570,8 @@ func (c *TableReplaceRowsCall) doRequest(alt string) (*http.Response, error) {
  urls += "?" + c.urlParams_.Encode()
  body = new(bytes.Buffer)
  ctype := "application/json"
- if c.protocol_ != "resumable" {
- cancel := gensupport.ConditionallyIncludeMedia(c.media_, &body, &ctype)
+ if c.protocol_ != "resumable" && c.media_ != nil {
+ cancel := gensupport.IncludeMedia(c.media_, &body, &ctype)
  defer cancel()
  }
  req, _ := http.NewRequest("POST", urls, body)

diff --git a/gamesconfiguration/v1configuration/gamesconfiguration-gen.go b/gamesconfiguration/v1configuration/gamesconfiguration-gen.go
@@ -1450,8 +1450,8 @@ func (c *ImageConfigurationsUploadCall) doRequest(alt string) (*http.Response, e
  urls += "?" + c.urlParams_.Encode()
  body = new(bytes.Buffer)
  ctype := "application/json"
- if c.protocol_ != "resumable" {
- cancel := gensupport.ConditionallyIncludeMedia(c.media_, &body, &ctype)
+ if c.protocol_ != "resumable" && c.media_ != nil {
+ cancel := gensupport.IncludeMedia(c.media_, &body, &ctype)
  defer cancel()
  }
  req, _ := http.NewRequest("POST", urls, body)

diff --git a/gensupport/media.go b/gensupport/media.go
@@ -70,7 +70,7 @@ func (sct *ContentSniffer) ContentType() (string, bool) {
  return sct.ctype, true
 }
 
-// ConditionallyIncludeMedia does nothing if media is nil.
+// IncludeMedia combines an existing HTTP body with media content to create a multipart/related HTTP body.
 //
 // bodyp is an in/out parameter. It should initially point to the
 // reader of the application/json (or whatever) payload to send in the
@@ -81,10 +81,7 @@ func (sct *ContentSniffer) ContentType() (string, bool) {
 // to the "multipart/related" content type, with random boundary.
 //
 // The return value is a function that can be used to close the bodyp Reader with an error.
-func ConditionallyIncludeMedia(media io.Reader, bodyp *io.Reader, ctypep *string) func() {
- if media == nil {
- return func() {}
- }
+func IncludeMedia(media io.Reader, bodyp *io.Reader, ctypep *string) func() {
  var mediaType string
  media, mediaType = getMediaType(media)
 

diff --git a/gmail/v1/gmail-gen.go b/gmail/v1/gmail-gen.go
@@ -1371,8 +1371,8 @@ func (c *UsersDraftsCreateCall) doRequest(alt string) (*http.Response, error) {
  c.urlParams_.Set("uploadType", c.protocol_)
  }
  urls += "?" + c.urlParams_.Encode()
- if c.protocol_ != "resumable" {
- cancel := gensupport.ConditionallyIncludeMedia(c.media_, &body, &ctype)
+ if c.protocol_ != "resumable" && c.media_ != nil {
+ cancel := gensupport.IncludeMedia(c.media_, &body, &ctype)
  defer cancel()
  }
  req, _ := http.NewRequest("POST", urls, body)
@@ -2070,8 +2070,8 @@ func (c *UsersDraftsSendCall) doRequest(alt string) (*http.Response, error) {
  c.urlParams_.Set("uploadType", c.protocol_)
  }
  urls += "?" + c.urlParams_.Encode()
- if c.protocol_ != "resumable" {
- cancel := gensupport.ConditionallyIncludeMedia(c.media_, &body, &ctype)
+ if c.protocol_ != "resumable" && c.media_ != nil {
+ cancel := gensupport.IncludeMedia(c.media_, &body, &ctype)
  defer cancel()
  }
  req, _ := http.NewRequest("POST", urls, body)
@@ -2302,8 +2302,8 @@ func (c *UsersDraftsUpdateCall) doRequest(alt string) (*http.Response, error) {
  c.urlParams_.Set("uploadType", c.protocol_)
  }
  urls += "?" + c.urlParams_.Encode()
- if c.protocol_ != "resumable" {
- cancel := gensupport.ConditionallyIncludeMedia(c.media_, &body, &ctype)
+ if c.protocol_ != "resumable" && c.media_ != nil {
+ cancel := gensupport.IncludeMedia(c.media_, &body, &ctype)
  defer cancel()
  }
  req, _ := http.NewRequest("PUT", urls, body)
@@ -3943,8 +3943,8 @@ func (c *UsersMessagesImportCall) doRequest(alt string) (*http.Response, error)
  c.urlParams_.Set("uploadType", c.protocol_)
  }
  urls += "?" + c.urlParams_.Encode()
- if c.protocol_ != "resumable" {
- cancel := gensupport.ConditionallyIncludeMedia(c.media_, &body, &ctype)
+ if c.protocol_ != "resumable" && c.media_ != nil {
+ cancel := gensupport.IncludeMedia(c.media_, &body, &ctype)
  defer cancel()
  }
  req, _ := http.NewRequest("POST", urls, body)
@@ -4227,8 +4227,8 @@ func (c *UsersMessagesInsertCall) doRequest(alt string) (*http.Response, error)
  c.urlParams_.Set("uploadType", c.protocol_)
  }
  urls += "?" + c.urlParams_.Encode()
- if c.protocol_ != "resumable" {
- cancel := gensupport.ConditionallyIncludeMedia(c.media_, &body, &ctype)
+ if c.protocol_ != "resumable" && c.media_ != nil {
+ cancel := gensupport.IncludeMedia(c.media_, &body, &ctype)
  defer cancel()
  }
  req, _ := http.NewRequest("POST", urls, body)
@@ -4835,8 +4835,8 @@ func (c *UsersMessagesSendCall) doRequest(alt string) (*http.Response, error) {
  c.urlParams_.Set("uploadType", c.protocol_)
  }
  urls += "?" + c.urlParams_.Encode()
- if c.protocol_ != "resumable" {
- cancel := gensupport.ConditionallyIncludeMedia(c.media_, &body, &ctype)
+ if c.protocol_ != "resumable" && c.media_ != nil {
+ cancel := gensupport.IncludeMedia(c.media_, &body, &ctype)
  defer cancel()
  }
  req, _ := http.NewRequest("POST", urls, body)

diff --git a/google-api-go-generator/gen.go b/google-api-go-generator/gen.go
@@ -1823,8 +1823,8 @@ func (meth *Method) generateCode() {
  pn(`ctype := "application/json"`)
  hasContentType = true
  }
- pn(`if c.protocol_ != "resumable" {`)
- pn(" cancel := gensupport.ConditionallyIncludeMedia(c.media_, &body, &ctype)")
+ pn(`if c.protocol_ != "resumable" && c.media_ != nil {`)
+ pn(" cancel := gensupport.IncludeMedia(c.media_, &body, &ctype)")
  pn(" defer cancel()")
  pn("}")
  }

diff --git a/groupsmigration/v1/groupsmigration-gen.go b/groupsmigration/v1/groupsmigration-gen.go
@@ -209,8 +209,8 @@ func (c *ArchiveInsertCall) doRequest(alt string) (*http.Response, error) {
  urls += "?" + c.urlParams_.Encode()
  body = new(bytes.Buffer)
  ctype := "application/json"
- if c.protocol_ != "resumable" {
- cancel := gensupport.ConditionallyIncludeMedia(c.media_, &body, &ctype)
+ if c.protocol_ != "resumable" && c.media_ != nil {
+ cancel := gensupport.IncludeMedia(c.media_, &body, &ctype)
  defer cancel()
  }
  req, _ := http.NewRequest("POST", urls, body)