potyarkin/restic
1
0
Fork 0
forked from TrueCloudLab/restic
Code Pull requests Activity

Update dependenciess

Browse source 
Exclude minio-go for now (pin to 3.x.y).
This commit is contained in:
Alexander Neumann 2017-12-03 21:01:25 +01:00
parent 9d0f13c4c0
commit 946c8399e2
2985 changed files with 1008107 additions and 118934 deletions
Download patch file Download diff file Expand all files Collapse all files

60
vendor/google.golang.org/api/google-api-go-generator/gen.go generated vendored
View file

@ -7,6 +7,7 @@ package main
import (
"bytes"
"encoding/json"
"errors"
"flag"
"fmt"
"go/format"
@ -132,11 +133,11 @@ func main() {
matches = append(matches, api)
log.Printf("Generating API %s", api.ID)
err := api.WriteGeneratedCode()
if err != nil {
if err != nil && err != errNoDoc {
errors = append(errors, &generateError{api, err})
continue
}
if *build {
if *build && err == nil {
var args []string
if *install {
args = append(args, "install")
@ -309,6 +310,10 @@ func slurpURL(urlStr string) []byte {
if err != nil {
log.Fatalf("Error fetching URL %s: %v", urlStr, err)
}
if res.StatusCode >= 300 {
log.Printf("WARNING: URL %s served status code %d", urlStr, res.StatusCode)
return nil
}
bs, err := ioutil.ReadAll(res.Body)
if err != nil {
log.Fatalf("Error reading body of URL %s: %v", urlStr, err)
@ -435,27 +440,40 @@ func (a *API) needsDataWrapper() bool {
}
func (a *API) jsonBytes() []byte {
if v := a.forceJSON; v != nil {
return v
}
if *useCache {
slurp, err := ioutil.ReadFile(a.JSONFile())
if err != nil {
log.Fatal(err)
if a.forceJSON == nil {
var slurp []byte
var err error
if *useCache {
slurp, err = ioutil.ReadFile(a.JSONFile())
if err != nil {
log.Fatal(err)
}
} else {
slurp = slurpURL(a.DiscoveryURL())
}
return slurp
a.forceJSON = slurp
}
return slurpURL(a.DiscoveryURL())
return a.forceJSON
}
func (a *API) JSONFile() string {
return filepath.Join(a.SourceDir(), a.Package()+"-api.json")
}
var errNoDoc = errors.New("could not read discovery doc")
// WriteGeneratedCode generates code for a.
// It returns errNoDoc if we couldn't read the discovery doc.
func (a *API) WriteGeneratedCode() error {
genfilename := *output
jsonBytes := a.jsonBytes()
// Skip generation if we don't have the discovery doc.
if jsonBytes == nil {
// No message here, because slurpURL printed one.
return errNoDoc
}
if genfilename == "" {
if err := writeFile(a.JSONFile(), a.jsonBytes()); err != nil {
if err := writeFile(a.JSONFile(), jsonBytes); err != nil {
return err
}
outdir := a.SourceDir()
@ -472,7 +490,10 @@ func (a *API) WriteGeneratedCode() error {
if err == nil {
err = errw
}
return err
if err != nil {
return err
}
return nil
}
var docsLink string
@ -1238,9 +1259,9 @@ func (s *Schema) writeSchemaStruct(api *API) {
// by listing them in the field identified by nullFieldsName.
func (s *Schema) writeSchemaMarshal(forceSendFieldName, nullFieldsName string) {
s.api.pn("func (s *%s) MarshalJSON() ([]byte, error) {", s.GoName())
s.api.pn("\ttype noMethod %s", s.GoName())
s.api.pn("\ttype NoMethod %s", s.GoName())
// pass schema as methodless type to prevent subsequent calls to MarshalJSON from recursing indefinitely.
s.api.pn("\traw := noMethod(*s)")
s.api.pn("\traw := NoMethod(*s)")
s.api.pn("\treturn gensupport.MarshalJSON(raw, s.%s, s.%s)", forceSendFieldName, nullFieldsName)
s.api.pn("}")
}
@ -1257,7 +1278,7 @@ func (s *Schema) writeSchemaUnmarshal() {
}
pn := s.api.pn
pn("\nfunc (s *%s) UnmarshalJSON(data []byte) error {", s.GoName())
pn(" type noMethod %s", s.GoName()) // avoid infinite recursion
pn(" type NoMethod %s", s.GoName()) // avoid infinite recursion
pn(" var s1 struct {")
// Hide the float64 fields of the schema with fields that correctly
// unmarshal special values.
@ -1268,10 +1289,10 @@ func (s *Schema) writeSchemaUnmarshal() {
}
pn("%s %s `json:\"%s\"`", p.assignedGoName, typ, p.p.Name)
}
pn(" *noMethod") // embed the schema
pn(" *NoMethod") // embed the schema
pn(" }")
// Set the schema value into the wrapper so its other fields are unmarshaled.
pn(" s1.noMethod = (*noMethod)(s)")
pn(" s1.NoMethod = (*NoMethod)(s)")
pn(" if err := json.Unmarshal(data, &s1); err != nil {")
pn(" return err")
pn(" }")
@ -1925,8 +1946,7 @@ func (meth *Method) generateCode() {
} else {
pn("target := &ret")
}
pn("if err := json.NewDecoder(res.Body).Decode(target); err != nil { return nil, err }")
pn("if err := gensupport.DecodeResponse(target, res); err != nil { return nil, err }")
pn("return ret, nil")
}

13
vendor/google.golang.org/api/google-api-go-generator/internal/disco/disco.go generated vendored
View file

@ -62,6 +62,19 @@ func (d *Document) init() error {
// NewDocument unmarshals the bytes into a Document.
// It also validates the document to make sure it is error-free.
func NewDocument(bytes []byte) (*Document, error) {
// The discovery service returns JSON with this format if there's an error, e.g.
// the document isn't found.
var errDoc struct {
Error struct {
Code int
Message string
Status string
}
}
if err := json.Unmarshal(bytes, &errDoc); err == nil && errDoc.Error.Code != 0 {
return nil, fmt.Errorf("bad discovery doc: %+v", errDoc.Error)
}
var doc Document
if err := json.Unmarshal(bytes, &doc); err != nil {
return nil, err

13
vendor/google.golang.org/api/google-api-go-generator/internal/disco/disco_test.go generated vendored
View file

@ -7,6 +7,7 @@ package disco
import (
"io/ioutil"
"reflect"
"strings"
"testing"
)
@ -262,3 +263,15 @@ func TestSchemaErrors(t *testing.T) {
}
}
}
func TestErrorDoc(t *testing.T) {
bytes, err := ioutil.ReadFile("testdata/error.json")
if err != nil {
t.Fatal(err)
}
if _, err := NewDocument(bytes); err == nil {
t.Error("got nil, want error")
} else if !strings.Contains(err.Error(), "404") {
t.Errorf("got %v, want 404", err)
}
}

7
vendor/google.golang.org/api/google-api-go-generator/internal/disco/testdata/error.json generated vendored Normal file
View file

@ -0,0 +1,7 @@
{
"error": {
"code": 404,
"message": "Discovery document not found for API service: container.googleapis.com format: rest version: v1alpha1",
"status": "NOT_FOUND"
}
}

82
vendor/google.golang.org/api/google-api-go-generator/testdata/any.want generated vendored
View file

@ -200,8 +200,8 @@ type ListLogServiceIndexesResponse struct {
}
func (s *ListLogServiceIndexesResponse) MarshalJSON() ([]byte, error) {
type noMethod ListLogServiceIndexesResponse
raw := noMethod(*s)
type NoMethod ListLogServiceIndexesResponse
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -235,8 +235,8 @@ type ListLogServiceSinksResponse struct {
}
func (s *ListLogServiceSinksResponse) MarshalJSON() ([]byte, error) {
type noMethod ListLogServiceSinksResponse
raw := noMethod(*s)
type NoMethod ListLogServiceSinksResponse
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -275,8 +275,8 @@ type ListLogServicesResponse struct {
}
func (s *ListLogServicesResponse) MarshalJSON() ([]byte, error) {
type noMethod ListLogServicesResponse
raw := noMethod(*s)
type NoMethod ListLogServicesResponse
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -309,8 +309,8 @@ type ListLogSinksResponse struct {
}
func (s *ListLogSinksResponse) MarshalJSON() ([]byte, error) {
type noMethod ListLogSinksResponse
raw := noMethod(*s)
type NoMethod ListLogSinksResponse
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -348,8 +348,8 @@ type ListLogsResponse struct {
}
func (s *ListLogsResponse) MarshalJSON() ([]byte, error) {
type noMethod ListLogsResponse
raw := noMethod(*s)
type NoMethod ListLogsResponse
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -385,8 +385,8 @@ type Log struct {
}
func (s *Log) MarshalJSON() ([]byte, error) {
type noMethod Log
raw := noMethod(*s)
type NoMethod Log
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -434,8 +434,8 @@ type LogEntry struct {
}
func (s *LogEntry) MarshalJSON() ([]byte, error) {
type noMethod LogEntry
raw := noMethod(*s)
type NoMethod LogEntry
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -513,8 +513,8 @@ type LogEntryMetadata struct {
}
func (s *LogEntryMetadata) MarshalJSON() ([]byte, error) {
type noMethod LogEntryMetadata
raw := noMethod(*s)
type NoMethod LogEntryMetadata
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -551,8 +551,8 @@ type LogError struct {
}
func (s *LogError) MarshalJSON() ([]byte, error) {
type noMethod LogError
raw := noMethod(*s)
type NoMethod LogError
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -584,8 +584,8 @@ type LogService struct {
}
func (s *LogService) MarshalJSON() ([]byte, error) {
type noMethod LogService
raw := noMethod(*s)
type NoMethod LogService
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -630,8 +630,8 @@ type LogSink struct {
}
func (s *LogSink) MarshalJSON() ([]byte, error) {
type noMethod LogSink
raw := noMethod(*s)
type NoMethod LogSink
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -669,8 +669,8 @@ type Status struct {
}
func (s *Status) MarshalJSON() ([]byte, error) {
type noMethod Status
raw := noMethod(*s)
type NoMethod Status
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -703,8 +703,8 @@ type WriteLogEntriesRequest struct {
}
func (s *WriteLogEntriesRequest) MarshalJSON() ([]byte, error) {
type noMethod WriteLogEntriesRequest
raw := noMethod(*s)
type NoMethod WriteLogEntriesRequest
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -848,7 +848,7 @@ func (c *ProjectsLogServicesListCall) Do(opts ...googleapi.CallOption) (*ListLog
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -1076,7 +1076,7 @@ func (c *ProjectsLogServicesIndexesListCall) Do(opts ...googleapi.CallOption) (*
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -1264,7 +1264,7 @@ func (c *ProjectsLogServicesSinksCreateCall) Do(opts ...googleapi.CallOption) (*
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -1403,7 +1403,7 @@ func (c *ProjectsLogServicesSinksDeleteCall) Do(opts ...googleapi.CallOption) (*
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -1560,7 +1560,7 @@ func (c *ProjectsLogServicesSinksGetCall) Do(opts ...googleapi.CallOption) (*Log
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -1714,7 +1714,7 @@ func (c *ProjectsLogServicesSinksListCall) Do(opts ...googleapi.CallOption) (*Li
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -1857,7 +1857,7 @@ func (c *ProjectsLogServicesSinksUpdateCall) Do(opts ...googleapi.CallOption) (*
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -2001,7 +2001,7 @@ func (c *ProjectsLogsDeleteCall) Do(opts ...googleapi.CallOption) (*Empty, error
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -2186,7 +2186,7 @@ func (c *ProjectsLogsListCall) Do(opts ...googleapi.CallOption) (*ListLogsRespon
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -2368,7 +2368,7 @@ func (c *ProjectsLogsEntriesWriteCall) Do(opts ...googleapi.CallOption) (*WriteL
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -2511,7 +2511,7 @@ func (c *ProjectsLogsSinksCreateCall) Do(opts ...googleapi.CallOption) (*LogSink
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -2650,7 +2650,7 @@ func (c *ProjectsLogsSinksDeleteCall) Do(opts ...googleapi.CallOption) (*Empty,
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -2807,7 +2807,7 @@ func (c *ProjectsLogsSinksGetCall) Do(opts ...googleapi.CallOption) (*LogSink, e
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -2961,7 +2961,7 @@ func (c *ProjectsLogsSinksListCall) Do(opts ...googleapi.CallOption) (*ListLogSi
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -3104,7 +3104,7 @@ func (c *ProjectsLogsSinksUpdateCall) Do(opts ...googleapi.CallOption) (*LogSink
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil

4
vendor/google.golang.org/api/google-api-go-generator/testdata/arrayofarray-1.want generated vendored
View file

@ -93,7 +93,7 @@ type GeoJsonMultiPolygon struct {
}
func (s *GeoJsonMultiPolygon) MarshalJSON() ([]byte, error) {
type noMethod GeoJsonMultiPolygon
raw := noMethod(*s)
type NoMethod GeoJsonMultiPolygon
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}

4
vendor/google.golang.org/api/google-api-go-generator/testdata/arrayofenum.want generated vendored
View file

@ -178,7 +178,7 @@ type Container struct {
}
func (s *Container) MarshalJSON() ([]byte, error) {
type noMethod Container
raw := noMethod(*s)
type NoMethod Container
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}

4
vendor/google.golang.org/api/google-api-go-generator/testdata/arrayofmapofobjects.want generated vendored
View file

@ -86,8 +86,8 @@ type Analyze struct {
}
func (s *Analyze) MarshalJSON() ([]byte, error) {
type noMethod Analyze
raw := noMethod(*s)
type NoMethod Analyze
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}

4
vendor/google.golang.org/api/google-api-go-generator/testdata/arrayofmapofstrings.want generated vendored
View file

@ -86,7 +86,7 @@ type Analyze struct {
}
func (s *Analyze) MarshalJSON() ([]byte, error) {
type noMethod Analyze
raw := noMethod(*s)
type NoMethod Analyze
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}

202
vendor/google.golang.org/api/google-api-go-generator/testdata/blogger-3.want generated vendored
View file

@ -232,8 +232,8 @@ type Blog struct {
}
func (s *Blog) MarshalJSON() ([]byte, error) {
type noMethod Blog
raw := noMethod(*s)
type NoMethod Blog
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -266,8 +266,8 @@ type BlogLocale struct {
}
func (s *BlogLocale) MarshalJSON() ([]byte, error) {
type noMethod BlogLocale
raw := noMethod(*s)
type NoMethod BlogLocale
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -297,8 +297,8 @@ type BlogPages struct {
}
func (s *BlogPages) MarshalJSON() ([]byte, error) {
type noMethod BlogPages
raw := noMethod(*s)
type NoMethod BlogPages
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -331,8 +331,8 @@ type BlogPosts struct {
}
func (s *BlogPosts) MarshalJSON() ([]byte, error) {
type noMethod BlogPosts
raw := noMethod(*s)
type NoMethod BlogPosts
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -369,8 +369,8 @@ type BlogList struct {
}
func (s *BlogList) MarshalJSON() ([]byte, error) {
type noMethod BlogList
raw := noMethod(*s)
type NoMethod BlogList
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -409,8 +409,8 @@ type BlogPerUserInfo struct {
}
func (s *BlogPerUserInfo) MarshalJSON() ([]byte, error) {
type noMethod BlogPerUserInfo
raw := noMethod(*s)
type NoMethod BlogPerUserInfo
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -446,8 +446,8 @@ type BlogUserInfo struct {
}
func (s *BlogUserInfo) MarshalJSON() ([]byte, error) {
type noMethod BlogUserInfo
raw := noMethod(*s)
type NoMethod BlogUserInfo
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -507,8 +507,8 @@ type Comment struct {
}
func (s *Comment) MarshalJSON() ([]byte, error) {
type noMethod Comment
raw := noMethod(*s)
type NoMethod Comment
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -544,8 +544,8 @@ type CommentAuthor struct {
}
func (s *CommentAuthor) MarshalJSON() ([]byte, error) {
type noMethod CommentAuthor
raw := noMethod(*s)
type NoMethod CommentAuthor
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -572,8 +572,8 @@ type CommentAuthorImage struct {
}
func (s *CommentAuthorImage) MarshalJSON() ([]byte, error) {
type noMethod CommentAuthorImage
raw := noMethod(*s)
type NoMethod CommentAuthorImage
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -600,8 +600,8 @@ type CommentBlog struct {
}
func (s *CommentBlog) MarshalJSON() ([]byte, error) {
type noMethod CommentBlog
raw := noMethod(*s)
type NoMethod CommentBlog
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -628,8 +628,8 @@ type CommentInReplyTo struct {
}
func (s *CommentInReplyTo) MarshalJSON() ([]byte, error) {
type noMethod CommentInReplyTo
raw := noMethod(*s)
type NoMethod CommentInReplyTo
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -656,8 +656,8 @@ type CommentPost struct {
}
func (s *CommentPost) MarshalJSON() ([]byte, error) {
type noMethod CommentPost
raw := noMethod(*s)
type NoMethod CommentPost
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -698,8 +698,8 @@ type CommentList struct {
}
func (s *CommentList) MarshalJSON() ([]byte, error) {
type noMethod CommentList
raw := noMethod(*s)
type NoMethod CommentList
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -761,8 +761,8 @@ type Page struct {
}
func (s *Page) MarshalJSON() ([]byte, error) {
type noMethod Page
raw := noMethod(*s)
type NoMethod Page
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -798,8 +798,8 @@ type PageAuthor struct {
}
func (s *PageAuthor) MarshalJSON() ([]byte, error) {
type noMethod PageAuthor
raw := noMethod(*s)
type NoMethod PageAuthor
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -826,8 +826,8 @@ type PageAuthorImage struct {
}
func (s *PageAuthorImage) MarshalJSON() ([]byte, error) {
type noMethod PageAuthorImage
raw := noMethod(*s)
type NoMethod PageAuthorImage
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -854,8 +854,8 @@ type PageBlog struct {
}
func (s *PageBlog) MarshalJSON() ([]byte, error) {
type noMethod PageBlog
raw := noMethod(*s)
type NoMethod PageBlog
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -888,8 +888,8 @@ type PageList struct {
}
func (s *PageList) MarshalJSON() ([]byte, error) {
type noMethod PageList
raw := noMethod(*s)
type NoMethod PageList
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -925,8 +925,8 @@ type Pageviews struct {
}
func (s *Pageviews) MarshalJSON() ([]byte, error) {
type noMethod Pageviews
raw := noMethod(*s)
type NoMethod Pageviews
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -955,8 +955,8 @@ type PageviewsCounts struct {
}
func (s *PageviewsCounts) MarshalJSON() ([]byte, error) {
type noMethod PageviewsCounts
raw := noMethod(*s)
type NoMethod PageviewsCounts
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -1034,8 +1034,8 @@ type Post struct {
}
func (s *Post) MarshalJSON() ([]byte, error) {
type noMethod Post
raw := noMethod(*s)
type NoMethod Post
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -1071,8 +1071,8 @@ type PostAuthor struct {
}
func (s *PostAuthor) MarshalJSON() ([]byte, error) {
type noMethod PostAuthor
raw := noMethod(*s)
type NoMethod PostAuthor
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -1099,8 +1099,8 @@ type PostAuthorImage struct {
}
func (s *PostAuthorImage) MarshalJSON() ([]byte, error) {
type noMethod PostAuthorImage
raw := noMethod(*s)
type NoMethod PostAuthorImage
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -1127,8 +1127,8 @@ type PostBlog struct {
}
func (s *PostBlog) MarshalJSON() ([]byte, error) {
type noMethod PostBlog
raw := noMethod(*s)
type NoMethod PostBlog
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -1153,8 +1153,8 @@ type PostImages struct {
}
func (s *PostImages) MarshalJSON() ([]byte, error) {
type noMethod PostImages
raw := noMethod(*s)
type NoMethod PostImages
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -1191,19 +1191,19 @@ type PostLocation struct {
}
func (s *PostLocation) MarshalJSON() ([]byte, error) {
type noMethod PostLocation
raw := noMethod(*s)
type NoMethod PostLocation
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
func (s *PostLocation) UnmarshalJSON(data []byte) error {
type noMethod PostLocation
type NoMethod PostLocation
var s1 struct {
Lat gensupport.JSONFloat64 `json:"lat"`
Lng gensupport.JSONFloat64 `json:"lng"`
*noMethod
*NoMethod
}
s1.noMethod = (*noMethod)(s)
s1.NoMethod = (*NoMethod)(s)
if err := json.Unmarshal(data, &s1); err != nil {
return err
}
@ -1241,8 +1241,8 @@ type PostReplies struct {
}
func (s *PostReplies) MarshalJSON() ([]byte, error) {
type noMethod PostReplies
raw := noMethod(*s)
type NoMethod PostReplies
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -1279,8 +1279,8 @@ type PostList struct {
}
func (s *PostList) MarshalJSON() ([]byte, error) {
type noMethod PostList
raw := noMethod(*s)
type NoMethod PostList
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -1318,8 +1318,8 @@ type PostPerUserInfo struct {
}
func (s *PostPerUserInfo) MarshalJSON() ([]byte, error) {
type noMethod PostPerUserInfo
raw := noMethod(*s)
type NoMethod PostPerUserInfo
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -1355,8 +1355,8 @@ type PostUserInfo struct {
}
func (s *PostUserInfo) MarshalJSON() ([]byte, error) {
type noMethod PostUserInfo
raw := noMethod(*s)
type NoMethod PostUserInfo
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -1394,8 +1394,8 @@ type PostUserInfosList struct {
}
func (s *PostUserInfosList) MarshalJSON() ([]byte, error) {
type noMethod PostUserInfosList
raw := noMethod(*s)
type NoMethod PostUserInfosList
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -1450,8 +1450,8 @@ type User struct {
}
func (s *User) MarshalJSON() ([]byte, error) {
type noMethod User
raw := noMethod(*s)
type NoMethod User
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -1478,8 +1478,8 @@ type UserBlogs struct {
}
func (s *UserBlogs) MarshalJSON() ([]byte, error) {
type noMethod UserBlogs
raw := noMethod(*s)
type NoMethod UserBlogs
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -1512,8 +1512,8 @@ type UserLocale struct {
}
func (s *UserLocale) MarshalJSON() ([]byte, error) {
type noMethod UserLocale
raw := noMethod(*s)
type NoMethod UserLocale
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -1634,7 +1634,7 @@ func (c *BlogUserInfosGetCall) Do(opts ...googleapi.CallOption) (*BlogUserInfo,
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -1792,7 +1792,7 @@ func (c *BlogsGetCall) Do(opts ...googleapi.CallOption) (*Blog, error) {
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -1932,7 +1932,7 @@ func (c *BlogsGetByUrlCall) Do(opts ...googleapi.CallOption) (*Blog, error) {
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -2089,7 +2089,7 @@ func (c *BlogsListByUserCall) Do(opts ...googleapi.CallOption) (*BlogList, error
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -2238,7 +2238,7 @@ func (c *CommentsApproveCall) Do(opts ...googleapi.CallOption) (*Comment, error)
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -2510,7 +2510,7 @@ func (c *CommentsGetCall) Do(opts ...googleapi.CallOption) (*Comment, error) {
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -2723,7 +2723,7 @@ func (c *CommentsListCall) Do(opts ...googleapi.CallOption) (*CommentList, error
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -2984,7 +2984,7 @@ func (c *CommentsListByBlogCall) Do(opts ...googleapi.CallOption) (*CommentList,
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -3163,7 +3163,7 @@ func (c *CommentsMarkAsSpamCall) Do(opts ...googleapi.CallOption) (*Comment, err
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -3306,7 +3306,7 @@ func (c *CommentsRemoveContentCall) Do(opts ...googleapi.CallOption) (*Comment,
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -3468,7 +3468,7 @@ func (c *PageViewsGetCall) Do(opts ...googleapi.CallOption) (*Pageviews, error)
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -3739,7 +3739,7 @@ func (c *PagesGetCall) Do(opts ...googleapi.CallOption) (*Page, error) {
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -3891,7 +3891,7 @@ func (c *PagesInsertCall) Do(opts ...googleapi.CallOption) (*Page, error) {
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -4061,7 +4061,7 @@ func (c *PagesListCall) Do(opts ...googleapi.CallOption) (*PageList, error) {
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -4229,7 +4229,7 @@ func (c *PagesPatchCall) Do(opts ...googleapi.CallOption) (*Page, error) {
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -4372,7 +4372,7 @@ func (c *PagesUpdateCall) Do(opts ...googleapi.CallOption) (*Page, error) {
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -4532,7 +4532,7 @@ func (c *PostUserInfosGetCall) Do(opts ...googleapi.CallOption) (*PostUserInfo,
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -4768,7 +4768,7 @@ func (c *PostUserInfosListCall) Do(opts ...googleapi.CallOption) (*PostUserInfos
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -5136,7 +5136,7 @@ func (c *PostsGetCall) Do(opts ...googleapi.CallOption) (*Post, error) {
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -5320,7 +5320,7 @@ func (c *PostsGetByPathCall) Do(opts ...googleapi.CallOption) (*Post, error) {
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -5485,7 +5485,7 @@ func (c *PostsInsertCall) Do(opts ...googleapi.CallOption) (*Post, error) {
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -5713,7 +5713,7 @@ func (c *PostsListCall) Do(opts ...googleapi.CallOption) (*PostList, error) {
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -5950,7 +5950,7 @@ func (c *PostsPatchCall) Do(opts ...googleapi.CallOption) (*Post, error) {
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -6093,7 +6093,7 @@ func (c *PostsPublishCall) Do(opts ...googleapi.CallOption) (*Post, error) {
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -6232,7 +6232,7 @@ func (c *PostsRevertCall) Do(opts ...googleapi.CallOption) (*Post, error) {
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -6396,7 +6396,7 @@ func (c *PostsSearchCall) Do(opts ...googleapi.CallOption) (*PostList, error) {
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -6557,7 +6557,7 @@ func (c *PostsUpdateCall) Do(opts ...googleapi.CallOption) (*Post, error) {
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -6704,7 +6704,7 @@ func (c *UsersGetCall) Do(opts ...googleapi.CallOption) (*User, error) {
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil

10
vendor/google.golang.org/api/google-api-go-generator/testdata/floats.want generated vendored
View file

@ -92,19 +92,19 @@ type Utilization struct {
}
func (s *Utilization) MarshalJSON() ([]byte, error) {
type noMethod Utilization
raw := noMethod(*s)
type NoMethod Utilization
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
func (s *Utilization) UnmarshalJSON(data []byte) error {
type noMethod Utilization
type NoMethod Utilization
var s1 struct {
Average gensupport.JSONFloat64 `json:"average"`
Target gensupport.JSONFloat64 `json:"target"`
*noMethod
*NoMethod
}
s1.noMethod = (*noMethod)(s)
s1.NoMethod = (*NoMethod)(s)
if err := json.Unmarshal(data, &s1); err != nil {
return err
}

10
vendor/google.golang.org/api/google-api-go-generator/testdata/getwithoutbody.want generated vendored
View file

@ -101,8 +101,8 @@ type ListMetricRequest struct {
}
func (s *ListMetricRequest) MarshalJSON() ([]byte, error) {
type noMethod ListMetricRequest
raw := noMethod(*s)
type NoMethod ListMetricRequest
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -141,8 +141,8 @@ type ListMetricResponse struct {
}
func (s *ListMetricResponse) MarshalJSON() ([]byte, error) {
type noMethod ListMetricResponse
raw := noMethod(*s)
type NoMethod ListMetricResponse
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -275,7 +275,7 @@ func (c *MetricDescriptorsListCall) Do(opts ...googleapi.CallOption) (*ListMetri
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil

8
vendor/google.golang.org/api/google-api-go-generator/testdata/mapofany.want generated vendored
View file

@ -91,8 +91,8 @@ type TableDataInsertAllRequest struct {
}
func (s *TableDataInsertAllRequest) MarshalJSON() ([]byte, error) {
type noMethod TableDataInsertAllRequest
raw := noMethod(*s)
type NoMethod TableDataInsertAllRequest
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -120,7 +120,7 @@ type TableDataInsertAllRequestRows struct {
}
func (s *TableDataInsertAllRequestRows) MarshalJSON() ([]byte, error) {
type noMethod TableDataInsertAllRequestRows
raw := noMethod(*s)
type NoMethod TableDataInsertAllRequestRows
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}

6
vendor/google.golang.org/api/google-api-go-generator/testdata/mapofarrayofobjects.want generated vendored
View file

@ -112,8 +112,8 @@ type TimeseriesDescriptor struct {
}
func (s *TimeseriesDescriptor) MarshalJSON() ([]byte, error) {
type noMethod TimeseriesDescriptor
raw := noMethod(*s)
type NoMethod TimeseriesDescriptor
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -199,7 +199,7 @@ func (c *AtlasGetMapCall) Do(opts ...googleapi.CallOption) (map[string]string, e
}
var ret map[string]string
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil

4
vendor/google.golang.org/api/google-api-go-generator/testdata/mapofint64strings.want generated vendored
View file

@ -89,7 +89,7 @@ type TestResultSummaryToolGroupTestSuite struct {
}
func (s *TestResultSummaryToolGroupTestSuite) MarshalJSON() ([]byte, error) {
type noMethod TestResultSummaryToolGroupTestSuite
raw := noMethod(*s)
type NoMethod TestResultSummaryToolGroupTestSuite
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}

8
vendor/google.golang.org/api/google-api-go-generator/testdata/mapofobjects.want generated vendored
View file

@ -86,8 +86,8 @@ type Entity struct {
}
func (s *Entity) MarshalJSON() ([]byte, error) {
type noMethod Entity
raw := noMethod(*s)
type NoMethod Entity
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -115,7 +115,7 @@ type EntityProperties struct {
}
func (s *EntityProperties) MarshalJSON() ([]byte, error) {
type noMethod EntityProperties
raw := noMethod(*s)
type NoMethod EntityProperties
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}

6
vendor/google.golang.org/api/google-api-go-generator/testdata/mapofstrings-1.want generated vendored
View file

@ -109,8 +109,8 @@ type TimeseriesDescriptor struct {
}
func (s *TimeseriesDescriptor) MarshalJSON() ([]byte, error) {
type noMethod TimeseriesDescriptor
raw := noMethod(*s)
type NoMethod TimeseriesDescriptor
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -196,7 +196,7 @@ func (c *AtlasGetMapCall) Do(opts ...googleapi.CallOption) (map[string]string, e
}
var ret map[string]string
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil

4
vendor/google.golang.org/api/google-api-go-generator/testdata/param-rename.want generated vendored
View file

@ -194,7 +194,7 @@ func (c *EventsMoveCall) Do(opts ...googleapi.CallOption) (*Event, error) {
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -340,7 +340,7 @@ func (c *ReportsQueryCall) Do(opts ...googleapi.CallOption) (*ResultTable, error
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil

4
vendor/google.golang.org/api/google-api-go-generator/testdata/quotednum.want generated vendored
View file

@ -96,7 +96,7 @@ type Creative struct {
}
func (s *Creative) MarshalJSON() ([]byte, error) {
type noMethod Creative
raw := noMethod(*s)
type NoMethod Creative
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}

212
vendor/google.golang.org/api/google-api-go-generator/testdata/resource-named-service.want generated vendored
View file

@ -202,8 +202,8 @@ type ApiConfigHandler struct {
}
func (s *ApiConfigHandler) MarshalJSON() ([]byte, error) {
type noMethod ApiConfigHandler
raw := noMethod(*s)
type NoMethod ApiConfigHandler
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -230,8 +230,8 @@ type ApiEndpointHandler struct {
}
func (s *ApiEndpointHandler) MarshalJSON() ([]byte, error) {
type noMethod ApiEndpointHandler
raw := noMethod(*s)
type NoMethod ApiEndpointHandler
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -305,8 +305,8 @@ type Application struct {
}
func (s *Application) MarshalJSON() ([]byte, error) {
type noMethod Application
raw := noMethod(*s)
type NoMethod Application
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -380,8 +380,8 @@ type AutomaticScaling struct {
}
func (s *AutomaticScaling) MarshalJSON() ([]byte, error) {
type noMethod AutomaticScaling
raw := noMethod(*s)
type NoMethod AutomaticScaling
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -415,8 +415,8 @@ type BasicScaling struct {
}
func (s *BasicScaling) MarshalJSON() ([]byte, error) {
type noMethod BasicScaling
raw := noMethod(*s)
type NoMethod BasicScaling
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -446,8 +446,8 @@ type ContainerInfo struct {
}
func (s *ContainerInfo) MarshalJSON() ([]byte, error) {
type noMethod ContainerInfo
raw := noMethod(*s)
type NoMethod ContainerInfo
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -481,18 +481,18 @@ type CpuUtilization struct {
}
func (s *CpuUtilization) MarshalJSON() ([]byte, error) {
type noMethod CpuUtilization
raw := noMethod(*s)
type NoMethod CpuUtilization
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
func (s *CpuUtilization) UnmarshalJSON(data []byte) error {
type noMethod CpuUtilization
type NoMethod CpuUtilization
var s1 struct {
TargetUtilization gensupport.JSONFloat64 `json:"targetUtilization"`
*noMethod
*NoMethod
}
s1.noMethod = (*noMethod)(s)
s1.NoMethod = (*NoMethod)(s)
if err := json.Unmarshal(data, &s1); err != nil {
return err
}
@ -537,8 +537,8 @@ type Deployment struct {
}
func (s *Deployment) MarshalJSON() ([]byte, error) {
type noMethod Deployment
raw := noMethod(*s)
type NoMethod Deployment
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -577,8 +577,8 @@ type DiskUtilization struct {
}
func (s *DiskUtilization) MarshalJSON() ([]byte, error) {
type noMethod DiskUtilization
raw := noMethod(*s)
type NoMethod DiskUtilization
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -619,8 +619,8 @@ type ErrorHandler struct {
}
func (s *ErrorHandler) MarshalJSON() ([]byte, error) {
type noMethod ErrorHandler
raw := noMethod(*s)
type NoMethod ErrorHandler
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -658,8 +658,8 @@ type FileInfo struct {
}
func (s *FileInfo) MarshalJSON() ([]byte, error) {
type noMethod FileInfo
raw := noMethod(*s)
type NoMethod FileInfo
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -711,8 +711,8 @@ type HealthCheck struct {
}
func (s *HealthCheck) MarshalJSON() ([]byte, error) {
type noMethod HealthCheck
raw := noMethod(*s)
type NoMethod HealthCheck
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -808,18 +808,18 @@ type Instance struct {
}
func (s *Instance) MarshalJSON() ([]byte, error) {
type noMethod Instance
raw := noMethod(*s)
type NoMethod Instance
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
func (s *Instance) UnmarshalJSON(data []byte) error {
type noMethod Instance
type NoMethod Instance
var s1 struct {
Qps gensupport.JSONFloat64 `json:"qps"`
*noMethod
*NoMethod
}
s1.noMethod = (*noMethod)(s)
s1.NoMethod = (*NoMethod)(s)
if err := json.Unmarshal(data, &s1); err != nil {
return err
}
@ -854,8 +854,8 @@ type Library struct {
}
func (s *Library) MarshalJSON() ([]byte, error) {
type noMethod Library
raw := noMethod(*s)
type NoMethod Library
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -891,8 +891,8 @@ type ListInstancesResponse struct {
}
func (s *ListInstancesResponse) MarshalJSON() ([]byte, error) {
type noMethod ListInstancesResponse
raw := noMethod(*s)
type NoMethod ListInstancesResponse
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -928,8 +928,8 @@ type ListLocationsResponse struct {
}
func (s *ListLocationsResponse) MarshalJSON() ([]byte, error) {
type noMethod ListLocationsResponse
raw := noMethod(*s)
type NoMethod ListLocationsResponse
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -965,8 +965,8 @@ type ListOperationsResponse struct {
}
func (s *ListOperationsResponse) MarshalJSON() ([]byte, error) {
type noMethod ListOperationsResponse
raw := noMethod(*s)
type NoMethod ListOperationsResponse
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -1001,8 +1001,8 @@ type ListServicesResponse struct {
}
func (s *ListServicesResponse) MarshalJSON() ([]byte, error) {
type noMethod ListServicesResponse
raw := noMethod(*s)
type NoMethod ListServicesResponse
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -1037,8 +1037,8 @@ type ListVersionsResponse struct {
}
func (s *ListVersionsResponse) MarshalJSON() ([]byte, error) {
type noMethod ListVersionsResponse
raw := noMethod(*s)
type NoMethod ListVersionsResponse
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -1083,8 +1083,8 @@ type Location struct {
}
func (s *Location) MarshalJSON() ([]byte, error) {
type noMethod Location
raw := noMethod(*s)
type NoMethod Location
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -1119,8 +1119,8 @@ type LocationMetadata struct {
}
func (s *LocationMetadata) MarshalJSON() ([]byte, error) {
type noMethod LocationMetadata
raw := noMethod(*s)
type NoMethod LocationMetadata
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -1152,8 +1152,8 @@ type ManualScaling struct {
}
func (s *ManualScaling) MarshalJSON() ([]byte, error) {
type noMethod ManualScaling
raw := noMethod(*s)
type NoMethod ManualScaling
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -1190,8 +1190,8 @@ type Network struct {
}
func (s *Network) MarshalJSON() ([]byte, error) {
type noMethod Network
raw := noMethod(*s)
type NoMethod Network
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -1230,8 +1230,8 @@ type NetworkUtilization struct {
}
func (s *NetworkUtilization) MarshalJSON() ([]byte, error) {
type noMethod NetworkUtilization
raw := noMethod(*s)
type NoMethod NetworkUtilization
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -1291,8 +1291,8 @@ type Operation struct {
}
func (s *Operation) MarshalJSON() ([]byte, error) {
type noMethod Operation
raw := noMethod(*s)
type NoMethod Operation
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -1338,8 +1338,8 @@ type OperationMetadata struct {
}
func (s *OperationMetadata) MarshalJSON() ([]byte, error) {
type noMethod OperationMetadata
raw := noMethod(*s)
type NoMethod OperationMetadata
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -1381,8 +1381,8 @@ type OperationMetadataV1 struct {
}
func (s *OperationMetadataV1) MarshalJSON() ([]byte, error) {
type noMethod OperationMetadataV1
raw := noMethod(*s)
type NoMethod OperationMetadataV1
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -1424,8 +1424,8 @@ type OperationMetadataV1Beta5 struct {
}
func (s *OperationMetadataV1Beta5) MarshalJSON() ([]byte, error) {
type noMethod OperationMetadataV1Beta5
raw := noMethod(*s)
type NoMethod OperationMetadataV1Beta5
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -1463,8 +1463,8 @@ type RequestUtilization struct {
}
func (s *RequestUtilization) MarshalJSON() ([]byte, error) {
type noMethod RequestUtilization
raw := noMethod(*s)
type NoMethod RequestUtilization
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -1497,20 +1497,20 @@ type Resources struct {
}
func (s *Resources) MarshalJSON() ([]byte, error) {
type noMethod Resources
raw := noMethod(*s)
type NoMethod Resources
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
func (s *Resources) UnmarshalJSON(data []byte) error {
type noMethod Resources
type NoMethod Resources
var s1 struct {
Cpu gensupport.JSONFloat64 `json:"cpu"`
DiskGb gensupport.JSONFloat64 `json:"diskGb"`
MemoryGb gensupport.JSONFloat64 `json:"memoryGb"`
*noMethod
*NoMethod
}
s1.noMethod = (*noMethod)(s)
s1.NoMethod = (*NoMethod)(s)
if err := json.Unmarshal(data, &s1); err != nil {
return err
}
@ -1544,8 +1544,8 @@ type ScriptHandler struct {
}
func (s *ScriptHandler) MarshalJSON() ([]byte, error) {
type noMethod ScriptHandler
raw := noMethod(*s)
type NoMethod ScriptHandler
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -1591,8 +1591,8 @@ type Service struct {
}
func (s *Service) MarshalJSON() ([]byte, error) {
type noMethod Service
raw := noMethod(*s)
type NoMethod Service
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -1652,8 +1652,8 @@ type StaticFilesHandler struct {
}
func (s *StaticFilesHandler) MarshalJSON() ([]byte, error) {
type noMethod StaticFilesHandler
raw := noMethod(*s)
type NoMethod StaticFilesHandler
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -1725,8 +1725,8 @@ type Status struct {
}
func (s *Status) MarshalJSON() ([]byte, error) {
type noMethod Status
raw := noMethod(*s)
type NoMethod Status
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -1772,8 +1772,8 @@ type TrafficSplit struct {
}
func (s *TrafficSplit) MarshalJSON() ([]byte, error) {
type noMethod TrafficSplit
raw := noMethod(*s)
type NoMethod TrafficSplit
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -1813,8 +1813,8 @@ type UrlDispatchRule struct {
}
func (s *UrlDispatchRule) MarshalJSON() ([]byte, error) {
type noMethod UrlDispatchRule
raw := noMethod(*s)
type NoMethod UrlDispatchRule
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -1898,8 +1898,8 @@ type UrlMap struct {
}
func (s *UrlMap) MarshalJSON() ([]byte, error) {
type noMethod UrlMap
raw := noMethod(*s)
type NoMethod UrlMap
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -2081,8 +2081,8 @@ type Version struct {
}
func (s *Version) MarshalJSON() ([]byte, error) {
type noMethod Version
raw := noMethod(*s)
type NoMethod Version
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -2116,8 +2116,8 @@ type ZipInfo struct {
}
func (s *ZipInfo) MarshalJSON() ([]byte, error) {
type noMethod ZipInfo
raw := noMethod(*s)
type NoMethod ZipInfo
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -2228,7 +2228,7 @@ func (c *AppsGetCall) Do(opts ...googleapi.CallOption) (*Application, error) {
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -2362,7 +2362,7 @@ func (c *AppsRepairCall) Do(opts ...googleapi.CallOption) (*Operation, error) {
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -2505,7 +2505,7 @@ func (c *AppsLocationsGetCall) Do(opts ...googleapi.CallOption) (*Location, erro
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -2671,7 +2671,7 @@ func (c *AppsLocationsListCall) Do(opts ...googleapi.CallOption) (*ListLocations
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -2850,7 +2850,7 @@ func (c *AppsOperationsGetCall) Do(opts ...googleapi.CallOption) (*Operation, er
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -3019,7 +3019,7 @@ func (c *AppsOperationsListCall) Do(opts ...googleapi.CallOption) (*ListOperatio
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -3182,7 +3182,7 @@ func (c *AppsServicesDeleteCall) Do(opts ...googleapi.CallOption) (*Operation, e
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -3329,7 +3329,7 @@ func (c *AppsServicesGetCall) Do(opts ...googleapi.CallOption) (*Service, error)
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -3487,7 +3487,7 @@ func (c *AppsServicesListCall) Do(opts ...googleapi.CallOption) (*ListServicesRe
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -3679,7 +3679,7 @@ func (c *AppsServicesPatchCall) Do(opts ...googleapi.CallOption) (*Operation, er
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -3832,7 +3832,7 @@ func (c *AppsServicesVersionsCreateCall) Do(opts ...googleapi.CallOption) (*Oper
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -3971,7 +3971,7 @@ func (c *AppsServicesVersionsDeleteCall) Do(opts ...googleapi.CallOption) (*Oper
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -4141,7 +4141,7 @@ func (c *AppsServicesVersionsGetCall) Do(opts ...googleapi.CallOption) (*Version
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -4329,7 +4329,7 @@ func (c *AppsServicesVersionsListCall) Do(opts ...googleapi.CallOption) (*ListVe
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -4538,7 +4538,7 @@ func (c *AppsServicesVersionsPatchCall) Do(opts ...googleapi.CallOption) (*Opera
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -4705,7 +4705,7 @@ func (c *AppsServicesVersionsInstancesDebugCall) Do(opts ...googleapi.CallOption
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -4861,7 +4861,7 @@ func (c *AppsServicesVersionsInstancesDeleteCall) Do(opts ...googleapi.CallOptio
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -5028,7 +5028,7 @@ func (c *AppsServicesVersionsInstancesGetCall) Do(opts ...googleapi.CallOption)
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil
@ -5206,7 +5206,7 @@ func (c *AppsServicesVersionsInstancesListCall) Do(opts ...googleapi.CallOption)
},
}
target := &ret
if err := json.NewDecoder(res.Body).Decode(target); err != nil {
if err := gensupport.DecodeResponse(target, res); err != nil {
return nil, err
}
return ret, nil

10
vendor/google.golang.org/api/google-api-go-generator/testdata/unfortunatedefaults.want generated vendored
View file

@ -220,20 +220,20 @@ type Thing struct {
}
func (s *Thing) MarshalJSON() ([]byte, error) {
type noMethod Thing
raw := noMethod(*s)
type NoMethod Thing
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
func (s *Thing) UnmarshalJSON(data []byte) error {
type noMethod Thing
type NoMethod Thing
var s1 struct {
NumericEmptyDefaultD gensupport.JSONFloat64 `json:"numeric_empty_default_d"`
NumericEmptyDefaultE gensupport.JSONFloat64 `json:"numeric_empty_default_e"`
NumericNonemptyDefaultB *gensupport.JSONFloat64 `json:"numeric_nonempty_default_b"`
*noMethod
*NoMethod
}
s1.noMethod = (*noMethod)(s)
s1.NoMethod = (*NoMethod)(s)
if err := json.Unmarshal(data, &s1); err != nil {
return err
}

40
vendor/google.golang.org/api/google-api-go-generator/testdata/variants.want generated vendored
View file

@ -157,8 +157,8 @@ type GeoJsonGeometryCollection struct {
}
func (s *GeoJsonGeometryCollection) MarshalJSON() ([]byte, error) {
type noMethod GeoJsonGeometryCollection
raw := noMethod(*s)
type NoMethod GeoJsonGeometryCollection
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -190,8 +190,8 @@ type GeoJsonLineString struct {
}
func (s *GeoJsonLineString) MarshalJSON() ([]byte, error) {
type noMethod GeoJsonLineString
raw := noMethod(*s)
type NoMethod GeoJsonLineString
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -225,8 +225,8 @@ type GeoJsonMultiLineString struct {
}
func (s *GeoJsonMultiLineString) MarshalJSON() ([]byte, error) {
type noMethod GeoJsonMultiLineString
raw := noMethod(*s)
type NoMethod GeoJsonMultiLineString
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -258,8 +258,8 @@ type GeoJsonMultiPoint struct {
}
func (s *GeoJsonMultiPoint) MarshalJSON() ([]byte, error) {
type noMethod GeoJsonMultiPoint
raw := noMethod(*s)
type NoMethod GeoJsonMultiPoint
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -292,8 +292,8 @@ type GeoJsonMultiPolygon struct {
}
func (s *GeoJsonMultiPolygon) MarshalJSON() ([]byte, error) {
type noMethod GeoJsonMultiPolygon
raw := noMethod(*s)
type NoMethod GeoJsonMultiPolygon
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -326,8 +326,8 @@ type GeoJsonPoint struct {
}
func (s *GeoJsonPoint) MarshalJSON() ([]byte, error) {
type noMethod GeoJsonPoint
raw := noMethod(*s)
type NoMethod GeoJsonPoint
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -364,8 +364,8 @@ type GeoJsonPolygon struct {
}
func (s *GeoJsonPolygon) MarshalJSON() ([]byte, error) {
type noMethod GeoJsonPolygon
raw := noMethod(*s)
type NoMethod GeoJsonPolygon
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -415,8 +415,8 @@ type MapFolder struct {
}
func (s *MapFolder) MarshalJSON() ([]byte, error) {
type noMethod MapFolder
raw := noMethod(*s)
type NoMethod MapFolder
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -491,8 +491,8 @@ type MapKmlLink struct {
}
func (s *MapKmlLink) MarshalJSON() ([]byte, error) {
type noMethod MapKmlLink
raw := noMethod(*s)
type NoMethod MapKmlLink
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}
@ -541,7 +541,7 @@ type MapLayer struct {
}
func (s *MapLayer) MarshalJSON() ([]byte, error) {
type noMethod MapLayer
raw := noMethod(*s)
type NoMethod MapLayer
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}

4
vendor/google.golang.org/api/google-api-go-generator/testdata/wrapnewlines.want generated vendored
View file

@ -92,7 +92,7 @@ type Thing struct {
}
func (s *Thing) MarshalJSON() ([]byte, error) {
type noMethod Thing
raw := noMethod(*s)
type NoMethod Thing
raw := NoMethod(*s)
return gensupport.MarshalJSON(raw, s.ForceSendFields, s.NullFields)
}