google-api-go-client: fix missing Content-Type

Breaking change made when adding Resumable media support here: 8ec38e5 caused Content-Type to not be filled in when the media was empty. This change always sets the content type as it used to do. All APIs have been updated. Change-Id: If8429e471c9aaeac1f26f7cd1b4ec97c327f6200 Reviewed-on: https://code-review.googlesource.com/1880 Reviewed-by: Brad Fitzpatrick <bradfitz@golang.org>
googleapis · Jan 27, 2015 · 901b69e · 901b69e
1 parent b3e6a82
commit 901b69e
Show file tree

Hide file tree

Showing 30 changed files with 92 additions and 481 deletions.
diff --git a/admin/email_migration_v2/admin-gen.go b/admin/email_migration_v2/admin-gen.go
@@ -183,10 +183,9 @@ func (c *MailInsertCall) Do() error {
 		params.Set("uploadType", c.protocol_)
 	}
 	urls += "?" + params.Encode()
-	var hasMedia_ bool
 	if c.protocol_ != "resumable" {
 		var cancel func()
-		cancel, hasMedia_ = googleapi.ConditionallyIncludeMedia(c.media_, &body, &ctype)
+		cancel, _ = googleapi.ConditionallyIncludeMedia(c.media_, &body, &ctype)
 		if cancel != nil {
 			defer cancel()
 		}
@@ -205,7 +204,7 @@ func (c *MailInsertCall) Do() error {
 		if params.Get("name") == "" {
 			return fmt.Errorf("resumable uploads must set the Name parameter.")
 		}
-	} else if hasMedia_ {
+	} else {
 		req.Header.Set("Content-Type", ctype)
 	}
 	req.Header.Set("User-Agent", "google-api-go-client/0.5")

diff --git a/analytics/v3/analytics-gen.go b/analytics/v3/analytics-gen.go
@@ -5673,10 +5673,9 @@ func (c *ManagementDailyUploadsUploadCall) Do() (*DailyUploadAppend, error) {
 	urls += "?" + params.Encode()
 	body = new(bytes.Buffer)
 	ctype := "application/json"
-	var hasMedia_ bool
 	if c.protocol_ != "resumable" {
 		var cancel func()
-		cancel, hasMedia_ = googleapi.ConditionallyIncludeMedia(c.media_, &body, &ctype)
+		cancel, _ = googleapi.ConditionallyIncludeMedia(c.media_, &body, &ctype)
 		if cancel != nil {
 			defer cancel()
 		}
@@ -5698,7 +5697,7 @@ func (c *ManagementDailyUploadsUploadCall) Do() (*DailyUploadAppend, error) {
 		if params.Get("name") == "" {
 			return nil, fmt.Errorf("resumable uploads must set the Name parameter.")
 		}
-	} else if hasMedia_ {
+	} else {
 		req.Header.Set("Content-Type", ctype)
 	}
 	req.Header.Set("User-Agent", "google-api-go-client/0.5")
@@ -10414,10 +10413,9 @@ func (c *ManagementUploadsUploadDataCall) Do() (*Upload, error) {
 	urls += "?" + params.Encode()
 	body = new(bytes.Buffer)
 	ctype := "application/json"
-	var hasMedia_ bool
 	if c.protocol_ != "resumable" {
 		var cancel func()
-		cancel, hasMedia_ = googleapi.ConditionallyIncludeMedia(c.media_, &body, &ctype)
+		cancel, _ = googleapi.ConditionallyIncludeMedia(c.media_, &body, &ctype)
 		if cancel != nil {
 			defer cancel()
 		}
@@ -10438,7 +10436,7 @@ func (c *ManagementUploadsUploadDataCall) Do() (*Upload, error) {
 		if params.Get("name") == "" {
 			return nil, fmt.Errorf("resumable uploads must set the Name parameter.")
 		}
-	} else if hasMedia_ {
+	} else {
 		req.Header.Set("Content-Type", ctype)
 	}
 	req.Header.Set("User-Agent", "google-api-go-client/0.5")

diff --git a/androidpublisher/v2/androidpublisher-gen.go b/androidpublisher/v2/androidpublisher-gen.go
@@ -1817,10 +1817,9 @@ func (c *EditsApksUploadCall) Do() (*Apk, error) {
 	urls += "?" + params.Encode()
 	body = new(bytes.Buffer)
 	ctype := "application/json"
-	var hasMedia_ bool
 	if c.protocol_ != "resumable" {
 		var cancel func()
-		cancel, hasMedia_ = googleapi.ConditionallyIncludeMedia(c.media_, &body, &ctype)
+		cancel, _ = googleapi.ConditionallyIncludeMedia(c.media_, &body, &ctype)
 		if cancel != nil {
 			defer cancel()
 		}
@@ -1840,7 +1839,7 @@ func (c *EditsApksUploadCall) Do() (*Apk, error) {
 		if params.Get("name") == "" {
 			return nil, fmt.Errorf("resumable uploads must set the Name parameter.")
 		}
-	} else if hasMedia_ {
+	} else {
 		req.Header.Set("Content-Type", ctype)
 	}
 	req.Header.Set("User-Agent", "google-api-go-client/0.5")
@@ -2656,10 +2655,9 @@ func (c *EditsExpansionfilesUploadCall) Do() (*ExpansionFilesUploadResponse, err
 	urls += "?" + params.Encode()
 	body = new(bytes.Buffer)
 	ctype := "application/json"
-	var hasMedia_ bool
 	if c.protocol_ != "resumable" {
 		var cancel func()
-		cancel, hasMedia_ = googleapi.ConditionallyIncludeMedia(c.media_, &body, &ctype)
+		cancel, _ = googleapi.ConditionallyIncludeMedia(c.media_, &body, &ctype)
 		if cancel != nil {
 			defer cancel()
 		}
@@ -2681,7 +2679,7 @@ func (c *EditsExpansionfilesUploadCall) Do() (*ExpansionFilesUploadResponse, err
 		if params.Get("name") == "" {
 			return nil, fmt.Errorf("resumable uploads must set the Name parameter.")
 		}
-	} else if hasMedia_ {
+	} else {
 		req.Header.Set("Content-Type", ctype)
 	}
 	req.Header.Set("User-Agent", "google-api-go-client/0.5")
@@ -3248,10 +3246,9 @@ func (c *EditsImagesUploadCall) Do() (*ImagesUploadResponse, error) {
 	urls += "?" + params.Encode()
 	body = new(bytes.Buffer)
 	ctype := "application/json"
-	var hasMedia_ bool
 	if c.protocol_ != "resumable" {
 		var cancel func()
-		cancel, hasMedia_ = googleapi.ConditionallyIncludeMedia(c.media_, &body, &ctype)
+		cancel, _ = googleapi.ConditionallyIncludeMedia(c.media_, &body, &ctype)
 		if cancel != nil {
 			defer cancel()
 		}
@@ -3273,7 +3270,7 @@ func (c *EditsImagesUploadCall) Do() (*ImagesUploadResponse, error) {
 		if params.Get("name") == "" {
 			return nil, fmt.Errorf("resumable uploads must set the Name parameter.")
 		}
-	} else if hasMedia_ {
+	} else {
 		req.Header.Set("Content-Type", ctype)
 	}
 	req.Header.Set("User-Agent", "google-api-go-client/0.5")

diff --git a/appsactivity/v1/appsactivity-api.json b/appsactivity/v1/appsactivity-api.json
@@ -1,6 +1,6 @@
 {
  "kind": "discovery#restDescription",
- "etag": "\"l66ggWbucbkBw9Lpos72oziyefE/0zYm3U9WhfJU7WORU2EWqKp-P40\"",
+ "etag": "\"ye6orv2F-1npMW3u9suM3a7C5Bo/forNnhAfI3dddvWHUgiTD-7URCo\"",
  "discoveryVersion": "v1",
  "id": "appsactivity:v1",
  "name": "appsactivity",
@@ -89,7 +89,6 @@
    "id": "Activity",
    "type": "object",
    "description": "An Activity resource is a combined view of multiple events. An activity has a list of individual events and a combined view of the common fields among all events.",
-   "externalTypeName": "google.appsactivity.v1.Activity",
    "properties": {
     "combinedEvent": {
      "$ref": "Event",
@@ -108,7 +107,6 @@
    "id": "Event",
    "type": "object",
    "description": "Represents the changes associated with an action taken by a user.",
-   "externalTypeName": "google.appsactivity.v1.Event",
    "properties": {
     "additionalEventTypes": {
      "type": "array",
@@ -211,7 +209,6 @@
    "id": "ListActivitiesResponse",
    "type": "object",
    "description": "The response from the list request. Contains a list of activities and a token to retrieve the next page of results.",
-   "externalTypeName": "google.appsactivity.v1.ListActivitiesResponse",
    "properties": {
     "activities": {
      "type": "array",
@@ -230,7 +227,6 @@
    "id": "Move",
    "type": "object",
    "description": "Contains information about changes in an object's parents as a result of a move type event.",
-   "externalTypeName": "google.appsactivity.v1.Move",
    "properties": {
     "addedParents": {
      "type": "array",
@@ -252,7 +248,6 @@
    "id": "Parent",
    "type": "object",
    "description": "Contains information about a parent object. For example, a folder in Drive is a parent for all files within it.",
-   "externalTypeName": "google.appsactivity.v1.Parent",
    "properties": {
     "id": {
      "type": "string",
@@ -272,7 +267,6 @@
    "id": "Permission",
    "type": "object",
    "description": "Contains information about the permissions and type of access allowed with regards to a Google Drive object. This is a subset of the fields contained in a corresponding Drive Permissions object.",
-   "externalTypeName": "google.appsactivity.v1.Permission",
    "properties": {
     "name": {
      "type": "string",
@@ -328,7 +322,6 @@
    "id": "PermissionChange",
    "type": "object",
    "description": "Contains information about a Drive object's permissions that changed as a result of a permissionChange type event.",
-   "externalTypeName": "google.appsactivity.v1.PermissionChange",
    "properties": {
     "addedPermissions": {
      "type": "array",
@@ -350,7 +343,6 @@
    "id": "Photo",
    "type": "object",
    "description": "Photo information for a user.",
-   "externalTypeName": "google.appsactivity.v1.Photo",
    "properties": {
     "url": {
      "type": "string",
@@ -362,7 +354,6 @@
    "id": "Rename",
    "type": "object",
    "description": "Contains information about a renametype event.",
-   "externalTypeName": "google.appsactivity.v1.Rename",
    "properties": {
     "newTitle": {
      "type": "string",
@@ -378,7 +369,6 @@
    "id": "Target",
    "type": "object",
    "description": "Information about the object modified by the event.",
-   "externalTypeName": "google.appsactivity.v1.Target",
    "properties": {
     "id": {
      "type": "string",
@@ -398,7 +388,6 @@
    "id": "User",
    "type": "object",
    "description": "A representation of a user.",
-   "externalTypeName": "google.appsactivity.v1.User",
    "properties": {
     "name": {
      "type": "string",

diff --git a/bigquery/v2/bigquery-gen.go b/bigquery/v2/bigquery-gen.go
@@ -2033,10 +2033,9 @@ func (c *JobsInsertCall) Do() (*Job, error) {
 		params.Set("uploadType", c.protocol_)
 	}
 	urls += "?" + params.Encode()
-	var hasMedia_ bool
 	if c.protocol_ != "resumable" {
 		var cancel func()
-		cancel, hasMedia_ = googleapi.ConditionallyIncludeMedia(c.media_, &body, &ctype)
+		cancel, _ = googleapi.ConditionallyIncludeMedia(c.media_, &body, &ctype)
 		if cancel != nil {
 			defer cancel()
 		}
@@ -2055,7 +2054,7 @@ func (c *JobsInsertCall) Do() (*Job, error) {
 		if params.Get("name") == "" {
 			return nil, fmt.Errorf("resumable uploads must set the Name parameter.")
 		}
-	} else if hasMedia_ {
+	} else {
 		req.Header.Set("Content-Type", ctype)
 	}
 	req.Header.Set("User-Agent", "google-api-go-client/0.5")

diff --git a/container/v1beta1/container-api.json b/container/v1beta1/container-api.json
@@ -1,6 +1,6 @@
 {
  "kind": "discovery#restDescription",
- "etag": "\"ye6orv2F-1npMW3u9suM3a7C5Bo/SXN1CJBboRcuoJhIRmlw8WIpB8c\"",
+ "etag": "\"ye6orv2F-1npMW3u9suM3a7C5Bo/AlGO7dz3sDTBKgLgnWPYGlYVP9g\"",
  "discoveryVersion": "v1",
  "id": "container:v1beta1",
  "name": "container",
@@ -79,7 +79,6 @@
   "Cluster": {
    "id": "Cluster",
    "type": "object",
-   "externalTypeName": "container.v1beta1.Cluster",
    "properties": {
     "clusterApiVersion": {
      "type": "string",
@@ -164,7 +163,6 @@
   "CreateClusterRequest": {
    "id": "CreateClusterRequest",
    "type": "object",
-   "externalTypeName": "container.v1beta1.CreateClusterRequest",
    "properties": {
     "cluster": {
      "$ref": "Cluster",
@@ -175,7 +173,6 @@
   "ListAggregatedClustersResponse": {
    "id": "ListAggregatedClustersResponse",
    "type": "object",
-   "externalTypeName": "container.v1beta1.ListAggregatedClustersResponse",
    "properties": {
     "clusters": {
      "type": "array",
@@ -189,7 +186,6 @@
   "ListAggregatedOperationsResponse": {
    "id": "ListAggregatedOperationsResponse",
    "type": "object",
-   "externalTypeName": "container.v1beta1.ListAggregatedOperationsResponse",
    "properties": {
     "operations": {
      "type": "array",
@@ -203,7 +199,6 @@
   "ListClustersResponse": {
    "id": "ListClustersResponse",
    "type": "object",
-   "externalTypeName": "container.v1beta1.ListClustersResponse",
    "properties": {
     "clusters": {
      "type": "array",
@@ -217,7 +212,6 @@
   "ListOperationsResponse": {
    "id": "ListOperationsResponse",
    "type": "object",
-   "externalTypeName": "container.v1beta1.ListOperationsResponse",
    "properties": {
     "operations": {
      "type": "array",
@@ -231,7 +225,6 @@
   "MasterAuth": {
    "id": "MasterAuth",
    "type": "object",
-   "externalTypeName": "container.v1beta1.MasterAuth",
    "properties": {
     "password": {
      "type": "string",
@@ -246,7 +239,6 @@
   "NodeConfig": {
    "id": "NodeConfig",
    "type": "object",
-   "externalTypeName": "container.v1beta1.NodeConfig",
    "properties": {
     "machineType": {
      "type": "string",
@@ -269,7 +261,6 @@
    "id": "Operation",
    "type": "object",
    "description": "Defines the operation resource. All fields are output only.",
-   "externalTypeName": "container.v1beta1.Operation",
    "properties": {
     "errorMessage": {
      "type": "string",
@@ -327,7 +318,6 @@
    "id": "ServiceAccount",
    "type": "object",
    "description": "A Compute Engine service account.",
-   "externalTypeName": "container.v1beta1.ServiceAccount",
    "properties": {
     "email": {
      "type": "string",