google-api-go-client: rollback commits due to licensing issues

This reverts the following commits: googleapis@661ac69 googleapis@fd68af8 googleapis@b036f29 Change-Id: I2b45d76c69bb97617cef44c71386e4ba5587e8c5 Reviewed-on: https://code-review.googlesource.com/3701 Reviewed-by: Dave Day <[email protected]> Reviewed-by: Brad Fitzpatrick <[email protected]>
R4CHI7 · Dec 10, 2015 · a5fc36f · a5fc36f
1 parent ece7143
commit a5fc36f
Show file tree

Hide file tree

Showing 27 changed files with 104 additions and 71 deletions.
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
@@ -36,7 +36,6 @@
 Alain Vongsouvanhalainv <[email protected]>
 Andrew Gerrand <[email protected]>
 Brad Fitzpatrick <[email protected]>
-Dragoslav Mitrinovic <[email protected]>
 Eric Koleda <[email protected]>
 Francesc Campoy <[email protected]>
 Garrick Evans <[email protected]>

diff --git a/admin/email_migration/v2/admin-gen.go b/admin/email_migration/v2/admin-gen.go
@@ -226,11 +226,12 @@ func (c *MailInsertCall) doRequest(alt string) (*http.Response, error) {
  "userKey": c.userKey,
  })
  if c.protocol_ == "resumable" {
+ req.ContentLength = 0
  if c.mediaType_ == "" {
  c.mediaType_ = googleapi.DetectMediaType(c.resumable_)
  }
  req.Header.Set("X-Upload-Content-Type", c.mediaType_)
- req.Header.Set("Content-Type", "application/json; charset=utf-8")
+ req.Body = nil
  } else {
  req.Header.Set("Content-Type", ctype)
  }

diff --git a/analytics/v3/analytics-gen.go b/analytics/v3/analytics-gen.go
@@ -13392,11 +13392,12 @@ func (c *ManagementUploadsUploadDataCall) doRequest(alt string) (*http.Response,
  "customDataSourceId": c.customDataSourceId,
  })
  if c.protocol_ == "resumable" {
+ req.ContentLength = 0
  if c.mediaType_ == "" {
  c.mediaType_ = googleapi.DetectMediaType(c.resumable_)
  }
  req.Header.Set("X-Upload-Content-Type", c.mediaType_)
- req.Header.Set("Content-Type", "application/json; charset=utf-8")
+ req.Body = nil
  } else {
  req.Header.Set("Content-Type", ctype)
  }

diff --git a/androidpublisher/v2/androidpublisher-gen.go b/androidpublisher/v2/androidpublisher-gen.go
@@ -3229,11 +3229,12 @@ func (c *EditsApksUploadCall) doRequest(alt string) (*http.Response, error) {
  "editId": c.editId,
  })
  if c.protocol_ == "resumable" {
+ req.ContentLength = 0
  if c.mediaType_ == "" {
  c.mediaType_ = googleapi.DetectMediaType(c.resumable_)
  }
  req.Header.Set("X-Upload-Content-Type", c.mediaType_)
- req.Header.Set("Content-Type", "application/json; charset=utf-8")
+ req.Body = nil
  } else {
  req.Header.Set("Content-Type", ctype)
  }
@@ -4325,11 +4326,12 @@ func (c *EditsExpansionfilesUploadCall) doRequest(alt string) (*http.Response, e
  "expansionFileType": c.expansionFileType,
  })
  if c.protocol_ == "resumable" {
+ req.ContentLength = 0
  if c.mediaType_ == "" {
  c.mediaType_ = googleapi.DetectMediaType(c.resumable_)
  }
  req.Header.Set("X-Upload-Content-Type", c.mediaType_)
- req.Header.Set("Content-Type", "application/json; charset=utf-8")
+ req.Body = nil
  } else {
  req.Header.Set("Content-Type", ctype)
  }
@@ -5045,11 +5047,12 @@ func (c *EditsImagesUploadCall) doRequest(alt string) (*http.Response, error) {
  "imageType": c.imageType,
  })
  if c.protocol_ == "resumable" {
+ req.ContentLength = 0
  if c.mediaType_ == "" {
  c.mediaType_ = googleapi.DetectMediaType(c.resumable_)
  }
  req.Header.Set("X-Upload-Content-Type", c.mediaType_)
- req.Header.Set("Content-Type", "application/json; charset=utf-8")
+ req.Body = nil
  } else {
  req.Header.Set("Content-Type", ctype)
  }

diff --git a/bigquery/v2/bigquery-gen.go b/bigquery/v2/bigquery-gen.go
@@ -3483,11 +3483,12 @@ func (c *JobsInsertCall) doRequest(alt string) (*http.Response, error) {
  "projectId": c.projectId,
  })
  if c.protocol_ == "resumable" {
+ req.ContentLength = 0
  if c.mediaType_ == "" {
  c.mediaType_ = googleapi.DetectMediaType(c.resumable_)
  }
  req.Header.Set("X-Upload-Content-Type", c.mediaType_)
- req.Header.Set("Content-Type", "application/json; charset=utf-8")
+ req.Body = nil
  } else {
  req.Header.Set("Content-Type", ctype)
  }

diff --git a/dfareporting/v2.0/dfareporting-gen.go b/dfareporting/v2.0/dfareporting-gen.go
@@ -17433,11 +17433,12 @@ func (c *CreativeAssetsInsertCall) doRequest(alt string) (*http.Response, error)
  "advertiserId": strconv.FormatInt(c.advertiserId, 10),
  })
  if c.protocol_ == "resumable" {
+ req.ContentLength = 0
  if c.mediaType_ == "" {
  c.mediaType_ = googleapi.DetectMediaType(c.resumable_)
  }
  req.Header.Set("X-Upload-Content-Type", c.mediaType_)
- req.Header.Set("Content-Type", "application/json; charset=utf-8")
+ req.Body = nil
  } else {
  req.Header.Set("Content-Type", ctype)
  }

diff --git a/dfareporting/v2.1/dfareporting-gen.go b/dfareporting/v2.1/dfareporting-gen.go
@@ -18898,11 +18898,12 @@ func (c *CreativeAssetsInsertCall) doRequest(alt string) (*http.Response, error)
  "advertiserId": strconv.FormatInt(c.advertiserId, 10),
  })
  if c.protocol_ == "resumable" {
+ req.ContentLength = 0
  if c.mediaType_ == "" {
  c.mediaType_ = googleapi.DetectMediaType(c.resumable_)
  }
  req.Header.Set("X-Upload-Content-Type", c.mediaType_)
- req.Header.Set("Content-Type", "application/json; charset=utf-8")
+ req.Body = nil
  } else {
  req.Header.Set("Content-Type", ctype)
  }

diff --git a/dfareporting/v2.2/dfareporting-gen.go b/dfareporting/v2.2/dfareporting-gen.go
@@ -18922,11 +18922,12 @@ func (c *CreativeAssetsInsertCall) doRequest(alt string) (*http.Response, error)
  "advertiserId": strconv.FormatInt(c.advertiserId, 10),
  })
  if c.protocol_ == "resumable" {
+ req.ContentLength = 0
  if c.mediaType_ == "" {
  c.mediaType_ = googleapi.DetectMediaType(c.resumable_)
  }
  req.Header.Set("X-Upload-Content-Type", c.mediaType_)
- req.Header.Set("Content-Type", "application/json; charset=utf-8")
+ req.Body = nil
  } else {
  req.Header.Set("Content-Type", ctype)
  }

diff --git a/dfareporting/v2.3/dfareporting-gen.go b/dfareporting/v2.3/dfareporting-gen.go
@@ -18942,11 +18942,12 @@ func (c *CreativeAssetsInsertCall) doRequest(alt string) (*http.Response, error)
  "advertiserId": strconv.FormatInt(c.advertiserId, 10),
  })
  if c.protocol_ == "resumable" {
+ req.ContentLength = 0
  if c.mediaType_ == "" {
  c.mediaType_ = googleapi.DetectMediaType(c.resumable_)
  }
  req.Header.Set("X-Upload-Content-Type", c.mediaType_)
- req.Header.Set("Content-Type", "application/json; charset=utf-8")
+ req.Body = nil
  } else {
  req.Header.Set("Content-Type", ctype)
  }

diff --git a/drive/v1/drive-gen.go b/drive/v1/drive-gen.go
@@ -535,11 +535,12 @@ func (c *FilesInsertCall) doRequest(alt string) (*http.Response, error) {
  req, _ := http.NewRequest("POST", urls, body)
  googleapi.SetOpaque(req.URL)
  if c.protocol_ == "resumable" {
+ req.ContentLength = 0
  if c.mediaType_ == "" {
  c.mediaType_ = googleapi.DetectMediaType(c.resumable_)
  }
  req.Header.Set("X-Upload-Content-Type", c.mediaType_)
- req.Header.Set("Content-Type", "application/json; charset=utf-8")
+ req.Body = nil
  } else {
  req.Header.Set("Content-Type", ctype)
  }
@@ -934,11 +935,12 @@ func (c *FilesUpdateCall) doRequest(alt string) (*http.Response, error) {
  "id": c.id,
  })
  if c.protocol_ == "resumable" {
+ req.ContentLength = 0
  if c.mediaType_ == "" {
  c.mediaType_ = googleapi.DetectMediaType(c.resumable_)
  }
  req.Header.Set("X-Upload-Content-Type", c.mediaType_)
- req.Header.Set("Content-Type", "application/json; charset=utf-8")
+ req.Body = nil
  } else {
  req.Header.Set("Content-Type", ctype)
  }

diff --git a/drive/v2/drive-gen.go b/drive/v2/drive-gen.go
@@ -5449,11 +5449,12 @@ func (c *FilesInsertCall) doRequest(alt string) (*http.Response, error) {
  req, _ := http.NewRequest("POST", urls, body)
  googleapi.SetOpaque(req.URL)
  if c.protocol_ == "resumable" {
+ req.ContentLength = 0
  if c.mediaType_ == "" {
  c.mediaType_ = googleapi.DetectMediaType(c.resumable_)
  }
  req.Header.Set("X-Upload-Content-Type", c.mediaType_)
- req.Header.Set("Content-Type", "application/json; charset=utf-8")
+ req.Body = nil
  } else {
  req.Header.Set("Content-Type", ctype)
  }
@@ -6717,11 +6718,12 @@ func (c *FilesUpdateCall) doRequest(alt string) (*http.Response, error) {
  "fileId": c.fileId,
  })
  if c.protocol_ == "resumable" {
+ req.ContentLength = 0
  if c.mediaType_ == "" {
  c.mediaType_ = googleapi.DetectMediaType(c.resumable_)
  }
  req.Header.Set("X-Upload-Content-Type", c.mediaType_)
- req.Header.Set("Content-Type", "application/json; charset=utf-8")
+ req.Body = nil
  } else {
  req.Header.Set("Content-Type", ctype)
  }
@@ -9583,11 +9585,12 @@ func (c *RealtimeUpdateCall) doRequest(alt string) (*http.Response, error) {
  "fileId": c.fileId,
  })
  if c.protocol_ == "resumable" {
+ req.ContentLength = 0
  if c.mediaType_ == "" {
  c.mediaType_ = googleapi.DetectMediaType(c.resumable_)
  }
  req.Header.Set("X-Upload-Content-Type", c.mediaType_)
- req.Header.Set("Content-Type", "application/json; charset=utf-8")
+ req.Body = nil
  } else {
  req.Header.Set("Content-Type", ctype)
  }

diff --git a/fusiontables/v1/fusiontables-gen.go b/fusiontables/v1/fusiontables-gen.go
@@ -3255,11 +3255,12 @@ func (c *TableImportRowsCall) doRequest(alt string) (*http.Response, error) {
  "tableId": c.tableId,
  })
  if c.protocol_ == "resumable" {
+ req.ContentLength = 0
  if c.mediaType_ == "" {
  c.mediaType_ = googleapi.DetectMediaType(c.resumable_)
  }
  req.Header.Set("X-Upload-Content-Type", c.mediaType_)
- req.Header.Set("Content-Type", "application/json; charset=utf-8")
+ req.Body = nil
  } else {
  req.Header.Set("Content-Type", ctype)
  }
@@ -3498,11 +3499,12 @@ func (c *TableImportTableCall) doRequest(alt string) (*http.Response, error) {
  req, _ := http.NewRequest("POST", urls, body)
  googleapi.SetOpaque(req.URL)
  if c.protocol_ == "resumable" {
+ req.ContentLength = 0
  if c.mediaType_ == "" {
  c.mediaType_ = googleapi.DetectMediaType(c.resumable_)
  }
  req.Header.Set("X-Upload-Content-Type", c.mediaType_)
- req.Header.Set("Content-Type", "application/json; charset=utf-8")
+ req.Body = nil
  } else {
  req.Header.Set("Content-Type", ctype)
  }

diff --git a/fusiontables/v2/fusiontables-gen.go b/fusiontables/v2/fusiontables-gen.go
@@ -3316,11 +3316,12 @@ func (c *TableImportRowsCall) doRequest(alt string) (*http.Response, error) {
  "tableId": c.tableId,
  })
  if c.protocol_ == "resumable" {
+ req.ContentLength = 0
  if c.mediaType_ == "" {
  c.mediaType_ = googleapi.DetectMediaType(c.resumable_)
  }
  req.Header.Set("X-Upload-Content-Type", c.mediaType_)
- req.Header.Set("Content-Type", "application/json; charset=utf-8")
+ req.Body = nil
  } else {
  req.Header.Set("Content-Type", ctype)
  }
@@ -3559,11 +3560,12 @@ func (c *TableImportTableCall) doRequest(alt string) (*http.Response, error) {
  req, _ := http.NewRequest("POST", urls, body)
  googleapi.SetOpaque(req.URL)
  if c.protocol_ == "resumable" {
+ req.ContentLength = 0
  if c.mediaType_ == "" {
  c.mediaType_ = googleapi.DetectMediaType(c.resumable_)
  }
  req.Header.Set("X-Upload-Content-Type", c.mediaType_)
- req.Header.Set("Content-Type", "application/json; charset=utf-8")
+ req.Body = nil
  } else {
  req.Header.Set("Content-Type", ctype)
  }
@@ -4193,11 +4195,12 @@ func (c *TableReplaceRowsCall) doRequest(alt string) (*http.Response, error) {
  "tableId": c.tableId,
  })
  if c.protocol_ == "resumable" {
+ req.ContentLength = 0
  if c.mediaType_ == "" {
  c.mediaType_ = googleapi.DetectMediaType(c.resumable_)
  }
  req.Header.Set("X-Upload-Content-Type", c.mediaType_)
- req.Header.Set("Content-Type", "application/json; charset=utf-8")
+ req.Body = nil
  } else {
  req.Header.Set("Content-Type", ctype)
  }

diff --git a/gamesconfiguration/v1configuration/gamesconfiguration-gen.go b/gamesconfiguration/v1configuration/gamesconfiguration-gen.go
@@ -1344,11 +1344,12 @@ func (c *ImageConfigurationsUploadCall) doRequest(alt string) (*http.Response, e
  "imageType": c.imageType,
  })
  if c.protocol_ == "resumable" {
+ req.ContentLength = 0
  if c.mediaType_ == "" {
  c.mediaType_ = googleapi.DetectMediaType(c.resumable_)
  }
  req.Header.Set("X-Upload-Content-Type", c.mediaType_)
- req.Header.Set("Content-Type", "application/json; charset=utf-8")
+ req.Body = nil
  } else {
  req.Header.Set("Content-Type", ctype)
  }

diff --git a/gmail/v1/gmail-gen.go b/gmail/v1/gmail-gen.go
@@ -1315,11 +1315,12 @@ func (c *UsersDraftsCreateCall) doRequest(alt string) (*http.Response, error) {
  "userId": c.userId,
  })
  if c.protocol_ == "resumable" {
+ req.ContentLength = 0
  if c.mediaType_ == "" {
  c.mediaType_ = googleapi.DetectMediaType(c.resumable_)
  }
  req.Header.Set("X-Upload-Content-Type", c.mediaType_)
- req.Header.Set("Content-Type", "application/json; charset=utf-8")
+ req.Body = nil
  } else {
  req.Header.Set("Content-Type", ctype)
  }
@@ -1947,11 +1948,12 @@ func (c *UsersDraftsSendCall) doRequest(alt string) (*http.Response, error) {
  "userId": c.userId,
  })
  if c.protocol_ == "resumable" {
+ req.ContentLength = 0
  if c.mediaType_ == "" {
  c.mediaType_ = googleapi.DetectMediaType(c.resumable_)
  }
  req.Header.Set("X-Upload-Content-Type", c.mediaType_)
- req.Header.Set("Content-Type", "application/json; charset=utf-8")
+ req.Body = nil
  } else {
  req.Header.Set("Content-Type", ctype)
  }
@@ -2164,11 +2166,12 @@ func (c *UsersDraftsUpdateCall) doRequest(alt string) (*http.Response, error) {
  "id": c.id,
  })
  if c.protocol_ == "resumable" {
+ req.ContentLength = 0
  if c.mediaType_ == "" {
  c.mediaType_ = googleapi.DetectMediaType(c.resumable_)
  }
  req.Header.Set("X-Upload-Content-Type", c.mediaType_)
- req.Header.Set("Content-Type", "application/json; charset=utf-8")
+ req.Body = nil
  } else {
  req.Header.Set("Content-Type", ctype)
  }
@@ -3635,11 +3638,12 @@ func (c *UsersMessagesImportCall) doRequest(alt string) (*http.Response, error)
  "userId": c.userId,
  })
  if c.protocol_ == "resumable" {
+ req.ContentLength = 0
  if c.mediaType_ == "" {
  c.mediaType_ = googleapi.DetectMediaType(c.resumable_)
  }
  req.Header.Set("X-Upload-Content-Type", c.mediaType_)
- req.Header.Set("Content-Type", "application/json; charset=utf-8")
+ req.Body = nil
  } else {
  req.Header.Set("Content-Type", ctype)
  }
@@ -3903,11 +3907,12 @@ func (c *UsersMessagesInsertCall) doRequest(alt string) (*http.Response, error)
  "userId": c.userId,
  })
  if c.protocol_ == "resumable" {
+ req.ContentLength = 0
  if c.mediaType_ == "" {
  c.mediaType_ = googleapi.DetectMediaType(c.resumable_)
  }
  req.Header.Set("X-Upload-Content-Type", c.mediaType_)
- req.Header.Set("Content-Type", "application/json; charset=utf-8")
+ req.Body = nil
  } else {
  req.Header.Set("Content-Type", ctype)
  }
@@ -4461,11 +4466,12 @@ func (c *UsersMessagesSendCall) doRequest(alt string) (*http.Response, error) {
  "userId": c.userId,
  })
  if c.protocol_ == "resumable" {
+ req.ContentLength = 0
  if c.mediaType_ == "" {
  c.mediaType_ = googleapi.DetectMediaType(c.resumable_)
  }
  req.Header.Set("X-Upload-Content-Type", c.mediaType_)
- req.Header.Set("Content-Type", "application/json; charset=utf-8")
+ req.Body = nil
  } else {
  req.Header.Set("Content-Type", ctype)
  }

diff --git a/google-api-go-generator/gen.go b/google-api-go-generator/gen.go
@@ -1800,11 +1800,12 @@ func (meth *Method) generateCode() {
 
  if meth.supportsMediaUpload() {
  pn(`if c.protocol_ == "resumable" {`)
+ pn(" req.ContentLength = 0")
  pn(` if c.mediaType_ == "" {`)
  pn(" c.mediaType_ = googleapi.DetectMediaType(c.resumable_)")
  pn(" }")
  pn(` req.Header.Set("X-Upload-Content-Type", c.mediaType_)`)
- pn(` req.Header.Set("Content-Type", "application/json; charset=utf-8")`)
+ pn(" req.Body = nil")
  pn("} else {")
  pn(` req.Header.Set("Content-Type", ctype)`)
  pn("}")