diff --git a/docs/swagger.json b/docs/swagger.json index a947d2d..30b487f 100644 --- a/docs/swagger.json +++ b/docs/swagger.json @@ -153,7 +153,7 @@ }, "/activities/{id}": { "get": { - "description": "Returns the given activity that is owned by the authenticated athlete. Requires activity:read for Everyone and Followers activities. Requires activity:read_all for Only Me activities.", + "description": "Returns the given activity that is owned by the authenticated athlete. Requires activity:read for Everyone and Followers activities. Requires activity:read_all for Only Me activities.\n\nWe strongly encourage you to display the appropriate attribution that identifies Garmin as the data source and the device name in your application. Please see example below from VeloViewer (that provides an attribution for a Garmin Forerunner device).\n\n![Attribution](/images/device-attribution-image.png)", "tags": [ "Activities" ], @@ -224,7 +224,7 @@ "hide_from_home": false, "highlighted_kudosers": [ { - "avatar_url": "https://dgalywyr863hv.cloudfront.net/pictures/athletes/12345678987654321/12345678987654321/3/medium.jpg", + "avatar_url": "https://xxxxx.cloudfront.net/pictures/athletes/12345678987654321/12345678987654321/3/medium.jpg", "destination_url": "strava://athletes/12345678987654321", "display_name": "Marianne V.", "show_name": true @@ -284,8 +284,8 @@ "source": 1, "unique_id": "3FDGKL3-204E-4867-9E8D-89FC79EAAE17", "urls": { - "100": "https://dgtzuqphqg23d.cloudfront.net/Bv93zv5t_mr57v0wXFbY_JyvtucgmU5Ym6N9z_bKeUI-128x96.jpg", - "600": "https://dgtzuqphqg23d.cloudfront.net/Bv93zv5t_mr57v0wXFbY_JyvtucgmU5Ym6N9z_bKeUI-768x576.jpg" + "100": "https://xxxxx.cloudfront.net/Bv93zv5t_mr57v0wXFbY_JyvtucgmU5Ym6N9z_bKeUI-128x96.jpg", + "600": "https://xxxxx.cloudfront.net/Bv93zv5t_mr57v0wXFbY_JyvtucgmU5Ym6N9z_bKeUI-768x576.jpg" } }, "use_primary_photo": true @@ -461,7 +461,7 @@ "hide_from_home": false, "highlighted_kudosers": [ { - "avatar_url": "https://dgalywyr863hv.cloudfront.net/pictures/athletes/12345678987654321/12345678987654321/3/medium.jpg", + "avatar_url": "https://xxxxx.cloudfront.net/pictures/athletes/12345678987654321/12345678987654321/3/medium.jpg", "destination_url": "strava://athletes/12345678987654321", "display_name": "Marianne V.", "show_name": true @@ -524,8 +524,8 @@ "source": 1, "unique_id": "3FDGKL3-204E-4867-9E8D-89FC79EAAE17", "urls": { - "100": "https://dgtzuqphqg23d.cloudfront.net/Bv93zv5t_mr57v0wXFbY_JyvtucgmU5Ym6N9z_bKeUI-128x96.jpg", - "600": "https://dgtzuqphqg23d.cloudfront.net/Bv93zv5t_mr57v0wXFbY_JyvtucgmU5Ym6N9z_bKeUI-768x576.jpg" + "100": "https://xxxxx.cloudfront.net/Bv93zv5t_mr57v0wXFbY_JyvtucgmU5Ym6N9z_bKeUI-128x96.jpg", + "600": "https://xxxxx.cloudfront.net/Bv93zv5t_mr57v0wXFbY_JyvtucgmU5Ym6N9z_bKeUI-768x576.jpg" } }, "use_primary_photo": true @@ -1179,6 +1179,7 @@ "average_watts": 175.3, "comment_count": 1, "commute": false, + "device_name": "Garmin Edge 1030", "device_watts": true, "distance": 24931.4, "elapsed_time": 4500, @@ -1238,6 +1239,7 @@ "average_watts": 200, "comment_count": 0, "commute": false, + "device_name": "Garmin Edge 1030", "device_watts": true, "distance": 23676.5, "elapsed_time": 5400, @@ -1333,15 +1335,15 @@ { "city": "San Francisco", "country": "United States", - "cover_photo": "https://dgalywyr863hv.cloudfront.net/pictures/clubs/231407/5098428/4/large.jpg", - "cover_photo_small": "https://dgalywyr863hv.cloudfront.net/pictures/clubs/231407/5098428/4/small.jpg", + "cover_photo": "https://xxxxx.cloudfront.net/pictures/clubs/231407/5098428/4/large.jpg", + "cover_photo_small": "https://xxxxx.cloudfront.net/pictures/clubs/231407/5098428/4/small.jpg", "featured": false, "id": 231407, "member_count": 93151, "name": "The Strava Club", "private": false, - "profile": "https://dgalywyr863hv.cloudfront.net/pictures/clubs/231407/5319085/1/large.jpg", - "profile_medium": "https://dgalywyr863hv.cloudfront.net/pictures/clubs/231407/5319085/1/medium.jpg", + "profile": "https://xxxxx.cloudfront.net/pictures/clubs/231407/5319085/1/large.jpg", + "profile_medium": "https://xxxxx.cloudfront.net/pictures/clubs/231407/5319085/1/medium.jpg", "resource_state": 2, "sport_type": "other", "state": "California", @@ -1563,8 +1565,8 @@ "city": "San Francisco", "club_type": "company", "country": "United States", - "cover_photo": "https://dgalywyr863hv.cloudfront.net/pictures/clubs/1/4328276/1/large.jpg", - "cover_photo_small": "https://dgalywyr863hv.cloudfront.net/pictures/clubs/1/4328276/1/small.jpg", + "cover_photo": "https://xxxxx.cloudfront.net/pictures/clubs/1/4328276/1/large.jpg", + "cover_photo_small": "https://xxxxx.cloudfront.net/pictures/clubs/1/4328276/1/small.jpg", "description": "Private club for Cyclists who work at Strava.", "featured": false, "following_count": 107, @@ -1576,8 +1578,8 @@ "owner_id": 759, "post_count": 29, "private": true, - "profile": "https://dgalywyr863hv.cloudfront.net/pictures/clubs/1/1582/4/large.jpg", - "profile_medium": "https://dgalywyr863hv.cloudfront.net/pictures/clubs/1/1582/4/medium.jpg", + "profile": "https://xxxxx.cloudfront.net/pictures/clubs/1/1582/4/large.jpg", + "profile_medium": "https://xxxxx.cloudfront.net/pictures/clubs/1/1582/4/medium.jpg", "resource_state": 3, "sport_type": "cycling", "state": "California", @@ -3258,6 +3260,10 @@ "description": "Whether this activity is a commute", "type": "boolean" }, + "device_name": { + "description": "The name of the device used to record the activity", + "type": "string" + }, "device_watts": { "description": "Whether the watts are from a power meter, false if estimated", "type": "boolean" @@ -4693,6 +4699,10 @@ "description": "Whether this activity is a commute", "type": "boolean" }, + "device_name": { + "description": "The name of the device used to record the activity", + "type": "string" + }, "device_watts": { "description": "Whether the watts are from a power meter, false if estimated", "type": "boolean" diff --git a/internal/gen/strava-api-go/client/activities/activities_client.go b/internal/gen/strava-api-go/client/activities/activities_client.go index 1c385c6..eebca21 100644 --- a/internal/gen/strava-api-go/client/activities/activities_client.go +++ b/internal/gen/strava-api-go/client/activities/activities_client.go @@ -79,7 +79,7 @@ CreateActivity creates an activity Creates a manual activity for an athlete, requires activity:write scope. */ func (a *Client) CreateActivity(params *CreateActivityParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*CreateActivityCreated, error) { - // TODO: Validate the params before sending + // NOTE: parameters are not validated before sending if params == nil { params = NewCreateActivityParams() } @@ -99,27 +99,36 @@ func (a *Client) CreateActivity(params *CreateActivityParams, authInfo runtime.C for _, opt := range opts { opt(op) } - result, err := a.transport.Submit(op) if err != nil { return nil, err } + + // only one success response has to be checked success, ok := result.(*CreateActivityCreated) if ok { return success, nil } - // unexpected success response + + // unexpected success response. + // + // a default response is provided: fill this and return an error unexpectedSuccess := result.(*CreateActivityDefault) + return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code()) } /* -GetActivityByID gets activity + GetActivityByID gets activity + + Returns the given activity that is owned by the authenticated athlete. Requires activity:read for Everyone and Followers activities. Requires activity:read_all for Only Me activities. -Returns the given activity that is owned by the authenticated athlete. Requires activity:read for Everyone and Followers activities. Requires activity:read_all for Only Me activities. +We strongly encourage you to display the appropriate attribution that identifies Garmin as the data source and the device name in your application. Please see example below from VeloViewer (that provides an attribution for a Garmin Forerunner device). + +![Attribution](/images/device-attribution-image.png) */ func (a *Client) GetActivityByID(params *GetActivityByIDParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*GetActivityByIDOK, error) { - // TODO: Validate the params before sending + // NOTE: parameters are not validated before sending if params == nil { params = NewGetActivityByIDParams() } @@ -139,17 +148,22 @@ func (a *Client) GetActivityByID(params *GetActivityByIDParams, authInfo runtime for _, opt := range opts { opt(op) } - result, err := a.transport.Submit(op) if err != nil { return nil, err } + + // only one success response has to be checked success, ok := result.(*GetActivityByIDOK) if ok { return success, nil } - // unexpected success response + + // unexpected success response. + // + // a default response is provided: fill this and return an error unexpectedSuccess := result.(*GetActivityByIDDefault) + return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code()) } @@ -159,7 +173,7 @@ GetCommentsByActivityID lists activity comments Returns the comments on the given activity. Requires activity:read for Everyone and Followers activities. Requires activity:read_all for Only Me activities. */ func (a *Client) GetCommentsByActivityID(params *GetCommentsByActivityIDParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*GetCommentsByActivityIDOK, error) { - // TODO: Validate the params before sending + // NOTE: parameters are not validated before sending if params == nil { params = NewGetCommentsByActivityIDParams() } @@ -179,17 +193,22 @@ func (a *Client) GetCommentsByActivityID(params *GetCommentsByActivityIDParams, for _, opt := range opts { opt(op) } - result, err := a.transport.Submit(op) if err != nil { return nil, err } + + // only one success response has to be checked success, ok := result.(*GetCommentsByActivityIDOK) if ok { return success, nil } - // unexpected success response + + // unexpected success response. + // + // a default response is provided: fill this and return an error unexpectedSuccess := result.(*GetCommentsByActivityIDDefault) + return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code()) } @@ -199,7 +218,7 @@ GetKudoersByActivityID lists activity kudoers Returns the athletes who kudoed an activity identified by an identifier. Requires activity:read for Everyone and Followers activities. Requires activity:read_all for Only Me activities. */ func (a *Client) GetKudoersByActivityID(params *GetKudoersByActivityIDParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*GetKudoersByActivityIDOK, error) { - // TODO: Validate the params before sending + // NOTE: parameters are not validated before sending if params == nil { params = NewGetKudoersByActivityIDParams() } @@ -219,17 +238,22 @@ func (a *Client) GetKudoersByActivityID(params *GetKudoersByActivityIDParams, au for _, opt := range opts { opt(op) } - result, err := a.transport.Submit(op) if err != nil { return nil, err } + + // only one success response has to be checked success, ok := result.(*GetKudoersByActivityIDOK) if ok { return success, nil } - // unexpected success response + + // unexpected success response. + // + // a default response is provided: fill this and return an error unexpectedSuccess := result.(*GetKudoersByActivityIDDefault) + return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code()) } @@ -239,7 +263,7 @@ GetLapsByActivityID lists activity laps Returns the laps of an activity identified by an identifier. Requires activity:read for Everyone and Followers activities. Requires activity:read_all for Only Me activities. */ func (a *Client) GetLapsByActivityID(params *GetLapsByActivityIDParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*GetLapsByActivityIDOK, error) { - // TODO: Validate the params before sending + // NOTE: parameters are not validated before sending if params == nil { params = NewGetLapsByActivityIDParams() } @@ -259,17 +283,22 @@ func (a *Client) GetLapsByActivityID(params *GetLapsByActivityIDParams, authInfo for _, opt := range opts { opt(op) } - result, err := a.transport.Submit(op) if err != nil { return nil, err } + + // only one success response has to be checked success, ok := result.(*GetLapsByActivityIDOK) if ok { return success, nil } - // unexpected success response + + // unexpected success response. + // + // a default response is provided: fill this and return an error unexpectedSuccess := result.(*GetLapsByActivityIDDefault) + return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code()) } @@ -279,7 +308,7 @@ GetLoggedInAthleteActivities lists athlete activities Returns the activities of an athlete for a specific identifier. Requires activity:read. Only Me activities will be filtered out unless requested by a token with activity:read_all. */ func (a *Client) GetLoggedInAthleteActivities(params *GetLoggedInAthleteActivitiesParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*GetLoggedInAthleteActivitiesOK, error) { - // TODO: Validate the params before sending + // NOTE: parameters are not validated before sending if params == nil { params = NewGetLoggedInAthleteActivitiesParams() } @@ -299,17 +328,22 @@ func (a *Client) GetLoggedInAthleteActivities(params *GetLoggedInAthleteActiviti for _, opt := range opts { opt(op) } - result, err := a.transport.Submit(op) if err != nil { return nil, err } + + // only one success response has to be checked success, ok := result.(*GetLoggedInAthleteActivitiesOK) if ok { return success, nil } - // unexpected success response + + // unexpected success response. + // + // a default response is provided: fill this and return an error unexpectedSuccess := result.(*GetLoggedInAthleteActivitiesDefault) + return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code()) } @@ -319,7 +353,7 @@ GetZonesByActivityID gets activity zones Summit Feature. Returns the zones of a given activity. Requires activity:read for Everyone and Followers activities. Requires activity:read_all for Only Me activities. */ func (a *Client) GetZonesByActivityID(params *GetZonesByActivityIDParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*GetZonesByActivityIDOK, error) { - // TODO: Validate the params before sending + // NOTE: parameters are not validated before sending if params == nil { params = NewGetZonesByActivityIDParams() } @@ -339,17 +373,22 @@ func (a *Client) GetZonesByActivityID(params *GetZonesByActivityIDParams, authIn for _, opt := range opts { opt(op) } - result, err := a.transport.Submit(op) if err != nil { return nil, err } + + // only one success response has to be checked success, ok := result.(*GetZonesByActivityIDOK) if ok { return success, nil } - // unexpected success response + + // unexpected success response. + // + // a default response is provided: fill this and return an error unexpectedSuccess := result.(*GetZonesByActivityIDDefault) + return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code()) } @@ -359,7 +398,7 @@ UpdateActivityByID updates activity Updates the given activity that is owned by the authenticated athlete. Requires activity:write. Also requires activity:read_all in order to update Only Me activities */ func (a *Client) UpdateActivityByID(params *UpdateActivityByIDParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*UpdateActivityByIDOK, error) { - // TODO: Validate the params before sending + // NOTE: parameters are not validated before sending if params == nil { params = NewUpdateActivityByIDParams() } @@ -379,17 +418,22 @@ func (a *Client) UpdateActivityByID(params *UpdateActivityByIDParams, authInfo r for _, opt := range opts { opt(op) } - result, err := a.transport.Submit(op) if err != nil { return nil, err } + + // only one success response has to be checked success, ok := result.(*UpdateActivityByIDOK) if ok { return success, nil } - // unexpected success response + + // unexpected success response. + // + // a default response is provided: fill this and return an error unexpectedSuccess := result.(*UpdateActivityByIDDefault) + return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code()) } diff --git a/internal/gen/strava-api-go/client/activities/create_activity_parameters.go b/internal/gen/strava-api-go/client/activities/create_activity_parameters.go index fa831f9..6ed4e48 100644 --- a/internal/gen/strava-api-go/client/activities/create_activity_parameters.go +++ b/internal/gen/strava-api-go/client/activities/create_activity_parameters.go @@ -61,7 +61,6 @@ CreateActivityParams contains all the parameters to send to the API endpoint Typically these are written to a http.Request. */ type CreateActivityParams struct { - /* Commute. Set to 1 to mark as commute. @@ -274,7 +273,6 @@ func (o *CreateActivityParams) SetType(typeVar *string) { // WriteToRequest writes these params to a swagger request func (o *CreateActivityParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { - if err := r.SetTimeout(o.timeout); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/activities/create_activity_responses.go b/internal/gen/strava-api-go/client/activities/create_activity_responses.go index 2150266..6bd4c97 100644 --- a/internal/gen/strava-api-go/client/activities/create_activity_responses.go +++ b/internal/gen/strava-api-go/client/activities/create_activity_responses.go @@ -7,6 +7,7 @@ package activities import ( "encoding/json" + stderrors "errors" "fmt" "io" @@ -22,7 +23,7 @@ type CreateActivityReader struct { } // ReadResponse reads a server response into the received o. -func (o *CreateActivityReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) { +func (o *CreateActivityReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (any, error) { switch response.Code() { case 201: result := NewCreateActivityCreated() @@ -101,11 +102,10 @@ func (o *CreateActivityCreated) GetPayload() *models.DetailedActivity { } func (o *CreateActivityCreated) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.DetailedActivity) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } @@ -175,11 +175,10 @@ func (o *CreateActivityDefault) GetPayload() *models.Fault { } func (o *CreateActivityDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.Fault) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } diff --git a/internal/gen/strava-api-go/client/activities/get_activity_by_id_parameters.go b/internal/gen/strava-api-go/client/activities/get_activity_by_id_parameters.go index 6ad7c60..93fe31d 100644 --- a/internal/gen/strava-api-go/client/activities/get_activity_by_id_parameters.go +++ b/internal/gen/strava-api-go/client/activities/get_activity_by_id_parameters.go @@ -61,7 +61,6 @@ GetActivityByIDParams contains all the parameters to send to the API endpoint Typically these are written to a http.Request. */ type GetActivityByIDParams struct { - /* ID. The identifier of the activity. @@ -153,7 +152,6 @@ func (o *GetActivityByIDParams) SetIncludeAllEfforts(includeAllEfforts *bool) { // WriteToRequest writes these params to a swagger request func (o *GetActivityByIDParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { - if err := r.SetTimeout(o.timeout); err != nil { return err } @@ -174,7 +172,6 @@ func (o *GetActivityByIDParams) WriteToRequest(r runtime.ClientRequest, reg strf } qIncludeAllEfforts := swag.FormatBool(qrIncludeAllEfforts) if qIncludeAllEfforts != "" { - if err := r.SetQueryParam("include_all_efforts", qIncludeAllEfforts); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/activities/get_activity_by_id_responses.go b/internal/gen/strava-api-go/client/activities/get_activity_by_id_responses.go index 0a77365..b1b7e57 100644 --- a/internal/gen/strava-api-go/client/activities/get_activity_by_id_responses.go +++ b/internal/gen/strava-api-go/client/activities/get_activity_by_id_responses.go @@ -7,6 +7,7 @@ package activities import ( "encoding/json" + stderrors "errors" "fmt" "io" @@ -22,7 +23,7 @@ type GetActivityByIDReader struct { } // ReadResponse reads a server response into the received o. -func (o *GetActivityByIDReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) { +func (o *GetActivityByIDReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (any, error) { switch response.Code() { case 200: result := NewGetActivityByIDOK() @@ -101,11 +102,10 @@ func (o *GetActivityByIDOK) GetPayload() *models.DetailedActivity { } func (o *GetActivityByIDOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.DetailedActivity) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } @@ -175,11 +175,10 @@ func (o *GetActivityByIDDefault) GetPayload() *models.Fault { } func (o *GetActivityByIDDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.Fault) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } diff --git a/internal/gen/strava-api-go/client/activities/get_comments_by_activity_id_parameters.go b/internal/gen/strava-api-go/client/activities/get_comments_by_activity_id_parameters.go index 49c22dd..6d6538f 100644 --- a/internal/gen/strava-api-go/client/activities/get_comments_by_activity_id_parameters.go +++ b/internal/gen/strava-api-go/client/activities/get_comments_by_activity_id_parameters.go @@ -61,7 +61,6 @@ GetCommentsByActivityIDParams contains all the parameters to send to the API end Typically these are written to a http.Request. */ type GetCommentsByActivityIDParams struct { - /* AfterCursor. Cursor of the last item in the previous page of results, used to request the subsequent page of results. When omitted, the first page of results is fetched. @@ -222,7 +221,6 @@ func (o *GetCommentsByActivityIDParams) SetPerPage(perPage *int64) { // WriteToRequest writes these params to a swagger request func (o *GetCommentsByActivityIDParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { - if err := r.SetTimeout(o.timeout); err != nil { return err } @@ -238,7 +236,6 @@ func (o *GetCommentsByActivityIDParams) WriteToRequest(r runtime.ClientRequest, } qAfterCursor := qrAfterCursor if qAfterCursor != "" { - if err := r.SetQueryParam("after_cursor", qAfterCursor); err != nil { return err } @@ -260,7 +257,6 @@ func (o *GetCommentsByActivityIDParams) WriteToRequest(r runtime.ClientRequest, } qPage := swag.FormatInt64(qrPage) if qPage != "" { - if err := r.SetQueryParam("page", qPage); err != nil { return err } @@ -277,7 +273,6 @@ func (o *GetCommentsByActivityIDParams) WriteToRequest(r runtime.ClientRequest, } qPageSize := swag.FormatInt64(qrPageSize) if qPageSize != "" { - if err := r.SetQueryParam("page_size", qPageSize); err != nil { return err } @@ -294,7 +289,6 @@ func (o *GetCommentsByActivityIDParams) WriteToRequest(r runtime.ClientRequest, } qPerPage := swag.FormatInt64(qrPerPage) if qPerPage != "" { - if err := r.SetQueryParam("per_page", qPerPage); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/activities/get_comments_by_activity_id_responses.go b/internal/gen/strava-api-go/client/activities/get_comments_by_activity_id_responses.go index 4e29f18..44861b1 100644 --- a/internal/gen/strava-api-go/client/activities/get_comments_by_activity_id_responses.go +++ b/internal/gen/strava-api-go/client/activities/get_comments_by_activity_id_responses.go @@ -7,6 +7,7 @@ package activities import ( "encoding/json" + stderrors "errors" "fmt" "io" @@ -22,7 +23,7 @@ type GetCommentsByActivityIDReader struct { } // ReadResponse reads a server response into the received o. -func (o *GetCommentsByActivityIDReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) { +func (o *GetCommentsByActivityIDReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (any, error) { switch response.Code() { case 200: result := NewGetCommentsByActivityIDOK() @@ -101,9 +102,8 @@ func (o *GetCommentsByActivityIDOK) GetPayload() []*models.Comment { } func (o *GetCommentsByActivityIDOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - // response payload - if err := consumer.Consume(response.Body(), &o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), &o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } @@ -173,11 +173,10 @@ func (o *GetCommentsByActivityIDDefault) GetPayload() *models.Fault { } func (o *GetCommentsByActivityIDDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.Fault) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } diff --git a/internal/gen/strava-api-go/client/activities/get_kudoers_by_activity_id_parameters.go b/internal/gen/strava-api-go/client/activities/get_kudoers_by_activity_id_parameters.go index 6a30a09..8607e55 100644 --- a/internal/gen/strava-api-go/client/activities/get_kudoers_by_activity_id_parameters.go +++ b/internal/gen/strava-api-go/client/activities/get_kudoers_by_activity_id_parameters.go @@ -61,7 +61,6 @@ GetKudoersByActivityIDParams contains all the parameters to send to the API endp Typically these are written to a http.Request. */ type GetKudoersByActivityIDParams struct { - /* ID. The identifier of the activity. @@ -101,9 +100,7 @@ func (o *GetKudoersByActivityIDParams) WithDefaults() *GetKudoersByActivityIDPar // // All values with no default are reset to their zero value. func (o *GetKudoersByActivityIDParams) SetDefaults() { - var ( - perPageDefault = int64(30) - ) + perPageDefault := int64(30) val := GetKudoersByActivityIDParams{ PerPage: &perPageDefault, @@ -183,7 +180,6 @@ func (o *GetKudoersByActivityIDParams) SetPerPage(perPage *int64) { // WriteToRequest writes these params to a swagger request func (o *GetKudoersByActivityIDParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { - if err := r.SetTimeout(o.timeout); err != nil { return err } @@ -204,7 +200,6 @@ func (o *GetKudoersByActivityIDParams) WriteToRequest(r runtime.ClientRequest, r } qPage := swag.FormatInt64(qrPage) if qPage != "" { - if err := r.SetQueryParam("page", qPage); err != nil { return err } @@ -221,7 +216,6 @@ func (o *GetKudoersByActivityIDParams) WriteToRequest(r runtime.ClientRequest, r } qPerPage := swag.FormatInt64(qrPerPage) if qPerPage != "" { - if err := r.SetQueryParam("per_page", qPerPage); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/activities/get_kudoers_by_activity_id_responses.go b/internal/gen/strava-api-go/client/activities/get_kudoers_by_activity_id_responses.go index 0c6d929..3f3bab4 100644 --- a/internal/gen/strava-api-go/client/activities/get_kudoers_by_activity_id_responses.go +++ b/internal/gen/strava-api-go/client/activities/get_kudoers_by_activity_id_responses.go @@ -7,6 +7,7 @@ package activities import ( "encoding/json" + stderrors "errors" "fmt" "io" @@ -22,7 +23,7 @@ type GetKudoersByActivityIDReader struct { } // ReadResponse reads a server response into the received o. -func (o *GetKudoersByActivityIDReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) { +func (o *GetKudoersByActivityIDReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (any, error) { switch response.Code() { case 200: result := NewGetKudoersByActivityIDOK() @@ -101,9 +102,8 @@ func (o *GetKudoersByActivityIDOK) GetPayload() []*models.SummaryAthlete { } func (o *GetKudoersByActivityIDOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - // response payload - if err := consumer.Consume(response.Body(), &o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), &o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } @@ -173,11 +173,10 @@ func (o *GetKudoersByActivityIDDefault) GetPayload() *models.Fault { } func (o *GetKudoersByActivityIDDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.Fault) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } diff --git a/internal/gen/strava-api-go/client/activities/get_laps_by_activity_id_parameters.go b/internal/gen/strava-api-go/client/activities/get_laps_by_activity_id_parameters.go index 673f15a..a1dd8d1 100644 --- a/internal/gen/strava-api-go/client/activities/get_laps_by_activity_id_parameters.go +++ b/internal/gen/strava-api-go/client/activities/get_laps_by_activity_id_parameters.go @@ -61,7 +61,6 @@ GetLapsByActivityIDParams contains all the parameters to send to the API endpoin Typically these are written to a http.Request. */ type GetLapsByActivityIDParams struct { - /* ID. The identifier of the activity. @@ -136,7 +135,6 @@ func (o *GetLapsByActivityIDParams) SetID(id int64) { // WriteToRequest writes these params to a swagger request func (o *GetLapsByActivityIDParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { - if err := r.SetTimeout(o.timeout); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/activities/get_laps_by_activity_id_responses.go b/internal/gen/strava-api-go/client/activities/get_laps_by_activity_id_responses.go index 4808f34..aebbb1b 100644 --- a/internal/gen/strava-api-go/client/activities/get_laps_by_activity_id_responses.go +++ b/internal/gen/strava-api-go/client/activities/get_laps_by_activity_id_responses.go @@ -7,6 +7,7 @@ package activities import ( "encoding/json" + stderrors "errors" "fmt" "io" @@ -22,7 +23,7 @@ type GetLapsByActivityIDReader struct { } // ReadResponse reads a server response into the received o. -func (o *GetLapsByActivityIDReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) { +func (o *GetLapsByActivityIDReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (any, error) { switch response.Code() { case 200: result := NewGetLapsByActivityIDOK() @@ -101,9 +102,8 @@ func (o *GetLapsByActivityIDOK) GetPayload() []*models.Lap { } func (o *GetLapsByActivityIDOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - // response payload - if err := consumer.Consume(response.Body(), &o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), &o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } @@ -173,11 +173,10 @@ func (o *GetLapsByActivityIDDefault) GetPayload() *models.Fault { } func (o *GetLapsByActivityIDDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.Fault) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } diff --git a/internal/gen/strava-api-go/client/activities/get_logged_in_athlete_activities_parameters.go b/internal/gen/strava-api-go/client/activities/get_logged_in_athlete_activities_parameters.go index a1a4814..d4106d4 100644 --- a/internal/gen/strava-api-go/client/activities/get_logged_in_athlete_activities_parameters.go +++ b/internal/gen/strava-api-go/client/activities/get_logged_in_athlete_activities_parameters.go @@ -61,7 +61,6 @@ GetLoggedInAthleteActivitiesParams contains all the parameters to send to the AP Typically these are written to a http.Request. */ type GetLoggedInAthleteActivitiesParams struct { - /* After. An epoch timestamp to use for filtering activities that have taken place after a certain time. @@ -105,9 +104,7 @@ func (o *GetLoggedInAthleteActivitiesParams) WithDefaults() *GetLoggedInAthleteA // // All values with no default are reset to their zero value. func (o *GetLoggedInAthleteActivitiesParams) SetDefaults() { - var ( - perPageDefault = int64(30) - ) + perPageDefault := int64(30) val := GetLoggedInAthleteActivitiesParams{ PerPage: &perPageDefault, @@ -198,7 +195,6 @@ func (o *GetLoggedInAthleteActivitiesParams) SetPerPage(perPage *int64) { // WriteToRequest writes these params to a swagger request func (o *GetLoggedInAthleteActivitiesParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { - if err := r.SetTimeout(o.timeout); err != nil { return err } @@ -214,7 +210,6 @@ func (o *GetLoggedInAthleteActivitiesParams) WriteToRequest(r runtime.ClientRequ } qAfter := swag.FormatInt64(qrAfter) if qAfter != "" { - if err := r.SetQueryParam("after", qAfter); err != nil { return err } @@ -231,7 +226,6 @@ func (o *GetLoggedInAthleteActivitiesParams) WriteToRequest(r runtime.ClientRequ } qBefore := swag.FormatInt64(qrBefore) if qBefore != "" { - if err := r.SetQueryParam("before", qBefore); err != nil { return err } @@ -248,7 +242,6 @@ func (o *GetLoggedInAthleteActivitiesParams) WriteToRequest(r runtime.ClientRequ } qPage := swag.FormatInt64(qrPage) if qPage != "" { - if err := r.SetQueryParam("page", qPage); err != nil { return err } @@ -265,7 +258,6 @@ func (o *GetLoggedInAthleteActivitiesParams) WriteToRequest(r runtime.ClientRequ } qPerPage := swag.FormatInt64(qrPerPage) if qPerPage != "" { - if err := r.SetQueryParam("per_page", qPerPage); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/activities/get_logged_in_athlete_activities_responses.go b/internal/gen/strava-api-go/client/activities/get_logged_in_athlete_activities_responses.go index 9964b49..194e929 100644 --- a/internal/gen/strava-api-go/client/activities/get_logged_in_athlete_activities_responses.go +++ b/internal/gen/strava-api-go/client/activities/get_logged_in_athlete_activities_responses.go @@ -7,6 +7,7 @@ package activities import ( "encoding/json" + stderrors "errors" "fmt" "io" @@ -22,7 +23,7 @@ type GetLoggedInAthleteActivitiesReader struct { } // ReadResponse reads a server response into the received o. -func (o *GetLoggedInAthleteActivitiesReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) { +func (o *GetLoggedInAthleteActivitiesReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (any, error) { switch response.Code() { case 200: result := NewGetLoggedInAthleteActivitiesOK() @@ -101,9 +102,8 @@ func (o *GetLoggedInAthleteActivitiesOK) GetPayload() []*models.SummaryActivity } func (o *GetLoggedInAthleteActivitiesOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - // response payload - if err := consumer.Consume(response.Body(), &o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), &o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } @@ -173,11 +173,10 @@ func (o *GetLoggedInAthleteActivitiesDefault) GetPayload() *models.Fault { } func (o *GetLoggedInAthleteActivitiesDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.Fault) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } diff --git a/internal/gen/strava-api-go/client/activities/get_zones_by_activity_id_parameters.go b/internal/gen/strava-api-go/client/activities/get_zones_by_activity_id_parameters.go index d1dc1a9..1e2be99 100644 --- a/internal/gen/strava-api-go/client/activities/get_zones_by_activity_id_parameters.go +++ b/internal/gen/strava-api-go/client/activities/get_zones_by_activity_id_parameters.go @@ -61,7 +61,6 @@ GetZonesByActivityIDParams contains all the parameters to send to the API endpoi Typically these are written to a http.Request. */ type GetZonesByActivityIDParams struct { - /* ID. The identifier of the activity. @@ -136,7 +135,6 @@ func (o *GetZonesByActivityIDParams) SetID(id int64) { // WriteToRequest writes these params to a swagger request func (o *GetZonesByActivityIDParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { - if err := r.SetTimeout(o.timeout); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/activities/get_zones_by_activity_id_responses.go b/internal/gen/strava-api-go/client/activities/get_zones_by_activity_id_responses.go index 9d50110..39bcc9d 100644 --- a/internal/gen/strava-api-go/client/activities/get_zones_by_activity_id_responses.go +++ b/internal/gen/strava-api-go/client/activities/get_zones_by_activity_id_responses.go @@ -7,6 +7,7 @@ package activities import ( "encoding/json" + stderrors "errors" "fmt" "io" @@ -22,7 +23,7 @@ type GetZonesByActivityIDReader struct { } // ReadResponse reads a server response into the received o. -func (o *GetZonesByActivityIDReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) { +func (o *GetZonesByActivityIDReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (any, error) { switch response.Code() { case 200: result := NewGetZonesByActivityIDOK() @@ -101,9 +102,8 @@ func (o *GetZonesByActivityIDOK) GetPayload() []*models.ActivityZone { } func (o *GetZonesByActivityIDOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - // response payload - if err := consumer.Consume(response.Body(), &o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), &o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } @@ -173,11 +173,10 @@ func (o *GetZonesByActivityIDDefault) GetPayload() *models.Fault { } func (o *GetZonesByActivityIDDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.Fault) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } diff --git a/internal/gen/strava-api-go/client/activities/update_activity_by_id_parameters.go b/internal/gen/strava-api-go/client/activities/update_activity_by_id_parameters.go index 8e684b9..4a314c9 100644 --- a/internal/gen/strava-api-go/client/activities/update_activity_by_id_parameters.go +++ b/internal/gen/strava-api-go/client/activities/update_activity_by_id_parameters.go @@ -63,7 +63,6 @@ UpdateActivityByIDParams contains all the parameters to send to the API endpoint Typically these are written to a http.Request. */ type UpdateActivityByIDParams struct { - // Body. Body *models.UpdatableActivity @@ -152,7 +151,6 @@ func (o *UpdateActivityByIDParams) SetID(id int64) { // WriteToRequest writes these params to a swagger request func (o *UpdateActivityByIDParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { - if err := r.SetTimeout(o.timeout); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/activities/update_activity_by_id_responses.go b/internal/gen/strava-api-go/client/activities/update_activity_by_id_responses.go index fcec116..5df3533 100644 --- a/internal/gen/strava-api-go/client/activities/update_activity_by_id_responses.go +++ b/internal/gen/strava-api-go/client/activities/update_activity_by_id_responses.go @@ -7,6 +7,7 @@ package activities import ( "encoding/json" + stderrors "errors" "fmt" "io" @@ -22,7 +23,7 @@ type UpdateActivityByIDReader struct { } // ReadResponse reads a server response into the received o. -func (o *UpdateActivityByIDReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) { +func (o *UpdateActivityByIDReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (any, error) { switch response.Code() { case 200: result := NewUpdateActivityByIDOK() @@ -101,11 +102,10 @@ func (o *UpdateActivityByIDOK) GetPayload() *models.DetailedActivity { } func (o *UpdateActivityByIDOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.DetailedActivity) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } @@ -175,11 +175,10 @@ func (o *UpdateActivityByIDDefault) GetPayload() *models.Fault { } func (o *UpdateActivityByIDDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.Fault) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } diff --git a/internal/gen/strava-api-go/client/athletes/athletes_client.go b/internal/gen/strava-api-go/client/athletes/athletes_client.go index 291a6e7..2d4a776 100644 --- a/internal/gen/strava-api-go/client/athletes/athletes_client.go +++ b/internal/gen/strava-api-go/client/athletes/athletes_client.go @@ -95,7 +95,7 @@ GetLoggedInAthlete gets authenticated athlete Returns the currently authenticated athlete. Tokens with profile:read_all scope will receive a detailed athlete representation; all others will receive a summary representation. */ func (a *Client) GetLoggedInAthlete(params *GetLoggedInAthleteParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*GetLoggedInAthleteOK, error) { - // TODO: Validate the params before sending + // NOTE: parameters are not validated before sending if params == nil { params = NewGetLoggedInAthleteParams() } @@ -115,17 +115,22 @@ func (a *Client) GetLoggedInAthlete(params *GetLoggedInAthleteParams, authInfo r for _, opt := range opts { opt(op) } - result, err := a.transport.Submit(op) if err != nil { return nil, err } + + // only one success response has to be checked success, ok := result.(*GetLoggedInAthleteOK) if ok { return success, nil } - // unexpected success response + + // unexpected success response. + // + // a default response is provided: fill this and return an error unexpectedSuccess := result.(*GetLoggedInAthleteDefault) + return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code()) } @@ -135,7 +140,7 @@ GetLoggedInAthleteZones gets zones Returns the the authenticated athlete's heart rate and power zones. Requires profile:read_all. */ func (a *Client) GetLoggedInAthleteZones(params *GetLoggedInAthleteZonesParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*GetLoggedInAthleteZonesOK, error) { - // TODO: Validate the params before sending + // NOTE: parameters are not validated before sending if params == nil { params = NewGetLoggedInAthleteZonesParams() } @@ -155,17 +160,22 @@ func (a *Client) GetLoggedInAthleteZones(params *GetLoggedInAthleteZonesParams, for _, opt := range opts { opt(op) } - result, err := a.transport.Submit(op) if err != nil { return nil, err } + + // only one success response has to be checked success, ok := result.(*GetLoggedInAthleteZonesOK) if ok { return success, nil } - // unexpected success response + + // unexpected success response. + // + // a default response is provided: fill this and return an error unexpectedSuccess := result.(*GetLoggedInAthleteZonesDefault) + return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code()) } @@ -175,7 +185,7 @@ GetStats gets athlete stats Returns the activity stats of an athlete. Only includes data from activities set to Everyone visibilty. */ func (a *Client) GetStats(params *GetStatsParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*GetStatsOK, error) { - // TODO: Validate the params before sending + // NOTE: parameters are not validated before sending if params == nil { params = NewGetStatsParams() } @@ -195,17 +205,22 @@ func (a *Client) GetStats(params *GetStatsParams, authInfo runtime.ClientAuthInf for _, opt := range opts { opt(op) } - result, err := a.transport.Submit(op) if err != nil { return nil, err } + + // only one success response has to be checked success, ok := result.(*GetStatsOK) if ok { return success, nil } - // unexpected success response + + // unexpected success response. + // + // a default response is provided: fill this and return an error unexpectedSuccess := result.(*GetStatsDefault) + return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code()) } @@ -215,7 +230,7 @@ UpdateLoggedInAthlete updates athlete Update the currently authenticated athlete. Requires profile:write scope. */ func (a *Client) UpdateLoggedInAthlete(params *UpdateLoggedInAthleteParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*UpdateLoggedInAthleteOK, error) { - // TODO: Validate the params before sending + // NOTE: parameters are not validated before sending if params == nil { params = NewUpdateLoggedInAthleteParams() } @@ -235,17 +250,22 @@ func (a *Client) UpdateLoggedInAthlete(params *UpdateLoggedInAthleteParams, auth for _, opt := range opts { opt(op) } - result, err := a.transport.Submit(op) if err != nil { return nil, err } + + // only one success response has to be checked success, ok := result.(*UpdateLoggedInAthleteOK) if ok { return success, nil } - // unexpected success response + + // unexpected success response. + // + // a default response is provided: fill this and return an error unexpectedSuccess := result.(*UpdateLoggedInAthleteDefault) + return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code()) } diff --git a/internal/gen/strava-api-go/client/athletes/get_logged_in_athlete_parameters.go b/internal/gen/strava-api-go/client/athletes/get_logged_in_athlete_parameters.go index 6e80bb6..808cc27 100644 --- a/internal/gen/strava-api-go/client/athletes/get_logged_in_athlete_parameters.go +++ b/internal/gen/strava-api-go/client/athletes/get_logged_in_athlete_parameters.go @@ -115,7 +115,6 @@ func (o *GetLoggedInAthleteParams) SetHTTPClient(client *http.Client) { // WriteToRequest writes these params to a swagger request func (o *GetLoggedInAthleteParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { - if err := r.SetTimeout(o.timeout); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/athletes/get_logged_in_athlete_responses.go b/internal/gen/strava-api-go/client/athletes/get_logged_in_athlete_responses.go index bf0fe72..836e193 100644 --- a/internal/gen/strava-api-go/client/athletes/get_logged_in_athlete_responses.go +++ b/internal/gen/strava-api-go/client/athletes/get_logged_in_athlete_responses.go @@ -7,6 +7,7 @@ package athletes import ( "encoding/json" + stderrors "errors" "fmt" "io" @@ -22,7 +23,7 @@ type GetLoggedInAthleteReader struct { } // ReadResponse reads a server response into the received o. -func (o *GetLoggedInAthleteReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) { +func (o *GetLoggedInAthleteReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (any, error) { switch response.Code() { case 200: result := NewGetLoggedInAthleteOK() @@ -101,11 +102,10 @@ func (o *GetLoggedInAthleteOK) GetPayload() *models.DetailedAthlete { } func (o *GetLoggedInAthleteOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.DetailedAthlete) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } @@ -175,11 +175,10 @@ func (o *GetLoggedInAthleteDefault) GetPayload() *models.Fault { } func (o *GetLoggedInAthleteDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.Fault) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } diff --git a/internal/gen/strava-api-go/client/athletes/get_logged_in_athlete_zones_parameters.go b/internal/gen/strava-api-go/client/athletes/get_logged_in_athlete_zones_parameters.go index 15c866b..ccfd9d4 100644 --- a/internal/gen/strava-api-go/client/athletes/get_logged_in_athlete_zones_parameters.go +++ b/internal/gen/strava-api-go/client/athletes/get_logged_in_athlete_zones_parameters.go @@ -115,7 +115,6 @@ func (o *GetLoggedInAthleteZonesParams) SetHTTPClient(client *http.Client) { // WriteToRequest writes these params to a swagger request func (o *GetLoggedInAthleteZonesParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { - if err := r.SetTimeout(o.timeout); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/athletes/get_logged_in_athlete_zones_responses.go b/internal/gen/strava-api-go/client/athletes/get_logged_in_athlete_zones_responses.go index 67f9a80..ecad60c 100644 --- a/internal/gen/strava-api-go/client/athletes/get_logged_in_athlete_zones_responses.go +++ b/internal/gen/strava-api-go/client/athletes/get_logged_in_athlete_zones_responses.go @@ -7,6 +7,7 @@ package athletes import ( "encoding/json" + stderrors "errors" "fmt" "io" @@ -22,7 +23,7 @@ type GetLoggedInAthleteZonesReader struct { } // ReadResponse reads a server response into the received o. -func (o *GetLoggedInAthleteZonesReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) { +func (o *GetLoggedInAthleteZonesReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (any, error) { switch response.Code() { case 200: result := NewGetLoggedInAthleteZonesOK() @@ -101,11 +102,10 @@ func (o *GetLoggedInAthleteZonesOK) GetPayload() *models.Zones { } func (o *GetLoggedInAthleteZonesOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.Zones) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } @@ -175,11 +175,10 @@ func (o *GetLoggedInAthleteZonesDefault) GetPayload() *models.Fault { } func (o *GetLoggedInAthleteZonesDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.Fault) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } diff --git a/internal/gen/strava-api-go/client/athletes/get_stats_parameters.go b/internal/gen/strava-api-go/client/athletes/get_stats_parameters.go index b11a45b..58eaee7 100644 --- a/internal/gen/strava-api-go/client/athletes/get_stats_parameters.go +++ b/internal/gen/strava-api-go/client/athletes/get_stats_parameters.go @@ -61,7 +61,6 @@ GetStatsParams contains all the parameters to send to the API endpoint Typically these are written to a http.Request. */ type GetStatsParams struct { - /* ID. The identifier of the athlete. Must match the authenticated athlete. @@ -136,7 +135,6 @@ func (o *GetStatsParams) SetID(id int64) { // WriteToRequest writes these params to a swagger request func (o *GetStatsParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { - if err := r.SetTimeout(o.timeout); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/athletes/get_stats_responses.go b/internal/gen/strava-api-go/client/athletes/get_stats_responses.go index cab2290..5433f3a 100644 --- a/internal/gen/strava-api-go/client/athletes/get_stats_responses.go +++ b/internal/gen/strava-api-go/client/athletes/get_stats_responses.go @@ -7,6 +7,7 @@ package athletes import ( "encoding/json" + stderrors "errors" "fmt" "io" @@ -22,7 +23,7 @@ type GetStatsReader struct { } // ReadResponse reads a server response into the received o. -func (o *GetStatsReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) { +func (o *GetStatsReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (any, error) { switch response.Code() { case 200: result := NewGetStatsOK() @@ -101,11 +102,10 @@ func (o *GetStatsOK) GetPayload() *models.ActivityStats { } func (o *GetStatsOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.ActivityStats) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } @@ -175,11 +175,10 @@ func (o *GetStatsDefault) GetPayload() *models.Fault { } func (o *GetStatsDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.Fault) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } diff --git a/internal/gen/strava-api-go/client/athletes/update_logged_in_athlete_parameters.go b/internal/gen/strava-api-go/client/athletes/update_logged_in_athlete_parameters.go index 7231156..42fc5a0 100644 --- a/internal/gen/strava-api-go/client/athletes/update_logged_in_athlete_parameters.go +++ b/internal/gen/strava-api-go/client/athletes/update_logged_in_athlete_parameters.go @@ -61,7 +61,6 @@ UpdateLoggedInAthleteParams contains all the parameters to send to the API endpo Typically these are written to a http.Request. */ type UpdateLoggedInAthleteParams struct { - /* Weight. The weight of the athlete in kilograms. @@ -136,7 +135,6 @@ func (o *UpdateLoggedInAthleteParams) SetWeight(weight float32) { // WriteToRequest writes these params to a swagger request func (o *UpdateLoggedInAthleteParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { - if err := r.SetTimeout(o.timeout); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/athletes/update_logged_in_athlete_responses.go b/internal/gen/strava-api-go/client/athletes/update_logged_in_athlete_responses.go index cd1fa8d..202a2dc 100644 --- a/internal/gen/strava-api-go/client/athletes/update_logged_in_athlete_responses.go +++ b/internal/gen/strava-api-go/client/athletes/update_logged_in_athlete_responses.go @@ -7,6 +7,7 @@ package athletes import ( "encoding/json" + stderrors "errors" "fmt" "io" @@ -22,7 +23,7 @@ type UpdateLoggedInAthleteReader struct { } // ReadResponse reads a server response into the received o. -func (o *UpdateLoggedInAthleteReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) { +func (o *UpdateLoggedInAthleteReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (any, error) { switch response.Code() { case 200: result := NewUpdateLoggedInAthleteOK() @@ -101,11 +102,10 @@ func (o *UpdateLoggedInAthleteOK) GetPayload() *models.DetailedAthlete { } func (o *UpdateLoggedInAthleteOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.DetailedAthlete) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } @@ -175,11 +175,10 @@ func (o *UpdateLoggedInAthleteDefault) GetPayload() *models.Fault { } func (o *UpdateLoggedInAthleteDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.Fault) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } diff --git a/internal/gen/strava-api-go/client/clubs/clubs_client.go b/internal/gen/strava-api-go/client/clubs/clubs_client.go index 80a2749..a86de48 100644 --- a/internal/gen/strava-api-go/client/clubs/clubs_client.go +++ b/internal/gen/strava-api-go/client/clubs/clubs_client.go @@ -73,7 +73,7 @@ GetClubActivitiesByID lists club activities Retrieve recent activities from members of a specific club. The authenticated athlete must belong to the requested club in order to hit this endpoint. Pagination is supported. Athlete profile visibility is respected for all activities. */ func (a *Client) GetClubActivitiesByID(params *GetClubActivitiesByIDParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*GetClubActivitiesByIDOK, error) { - // TODO: Validate the params before sending + // NOTE: parameters are not validated before sending if params == nil { params = NewGetClubActivitiesByIDParams() } @@ -93,17 +93,22 @@ func (a *Client) GetClubActivitiesByID(params *GetClubActivitiesByIDParams, auth for _, opt := range opts { opt(op) } - result, err := a.transport.Submit(op) if err != nil { return nil, err } + + // only one success response has to be checked success, ok := result.(*GetClubActivitiesByIDOK) if ok { return success, nil } - // unexpected success response + + // unexpected success response. + // + // a default response is provided: fill this and return an error unexpectedSuccess := result.(*GetClubActivitiesByIDDefault) + return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code()) } @@ -113,7 +118,7 @@ GetClubAdminsByID lists club administrators Returns a list of the administrators of a given club. */ func (a *Client) GetClubAdminsByID(params *GetClubAdminsByIDParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*GetClubAdminsByIDOK, error) { - // TODO: Validate the params before sending + // NOTE: parameters are not validated before sending if params == nil { params = NewGetClubAdminsByIDParams() } @@ -133,17 +138,22 @@ func (a *Client) GetClubAdminsByID(params *GetClubAdminsByIDParams, authInfo run for _, opt := range opts { opt(op) } - result, err := a.transport.Submit(op) if err != nil { return nil, err } + + // only one success response has to be checked success, ok := result.(*GetClubAdminsByIDOK) if ok { return success, nil } - // unexpected success response + + // unexpected success response. + // + // a default response is provided: fill this and return an error unexpectedSuccess := result.(*GetClubAdminsByIDDefault) + return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code()) } @@ -153,7 +163,7 @@ GetClubByID gets club Returns a given a club using its identifier. */ func (a *Client) GetClubByID(params *GetClubByIDParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*GetClubByIDOK, error) { - // TODO: Validate the params before sending + // NOTE: parameters are not validated before sending if params == nil { params = NewGetClubByIDParams() } @@ -173,17 +183,22 @@ func (a *Client) GetClubByID(params *GetClubByIDParams, authInfo runtime.ClientA for _, opt := range opts { opt(op) } - result, err := a.transport.Submit(op) if err != nil { return nil, err } + + // only one success response has to be checked success, ok := result.(*GetClubByIDOK) if ok { return success, nil } - // unexpected success response + + // unexpected success response. + // + // a default response is provided: fill this and return an error unexpectedSuccess := result.(*GetClubByIDDefault) + return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code()) } @@ -193,7 +208,7 @@ GetClubMembersByID lists club members Returns a list of the athletes who are members of a given club. */ func (a *Client) GetClubMembersByID(params *GetClubMembersByIDParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*GetClubMembersByIDOK, error) { - // TODO: Validate the params before sending + // NOTE: parameters are not validated before sending if params == nil { params = NewGetClubMembersByIDParams() } @@ -213,17 +228,22 @@ func (a *Client) GetClubMembersByID(params *GetClubMembersByIDParams, authInfo r for _, opt := range opts { opt(op) } - result, err := a.transport.Submit(op) if err != nil { return nil, err } + + // only one success response has to be checked success, ok := result.(*GetClubMembersByIDOK) if ok { return success, nil } - // unexpected success response + + // unexpected success response. + // + // a default response is provided: fill this and return an error unexpectedSuccess := result.(*GetClubMembersByIDDefault) + return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code()) } @@ -233,7 +253,7 @@ GetLoggedInAthleteClubs lists athlete clubs Returns a list of the clubs whose membership includes the authenticated athlete. */ func (a *Client) GetLoggedInAthleteClubs(params *GetLoggedInAthleteClubsParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*GetLoggedInAthleteClubsOK, error) { - // TODO: Validate the params before sending + // NOTE: parameters are not validated before sending if params == nil { params = NewGetLoggedInAthleteClubsParams() } @@ -253,17 +273,22 @@ func (a *Client) GetLoggedInAthleteClubs(params *GetLoggedInAthleteClubsParams, for _, opt := range opts { opt(op) } - result, err := a.transport.Submit(op) if err != nil { return nil, err } + + // only one success response has to be checked success, ok := result.(*GetLoggedInAthleteClubsOK) if ok { return success, nil } - // unexpected success response + + // unexpected success response. + // + // a default response is provided: fill this and return an error unexpectedSuccess := result.(*GetLoggedInAthleteClubsDefault) + return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code()) } diff --git a/internal/gen/strava-api-go/client/clubs/get_club_activities_by_id_parameters.go b/internal/gen/strava-api-go/client/clubs/get_club_activities_by_id_parameters.go index 25d7700..80b4be1 100644 --- a/internal/gen/strava-api-go/client/clubs/get_club_activities_by_id_parameters.go +++ b/internal/gen/strava-api-go/client/clubs/get_club_activities_by_id_parameters.go @@ -61,7 +61,6 @@ GetClubActivitiesByIDParams contains all the parameters to send to the API endpo Typically these are written to a http.Request. */ type GetClubActivitiesByIDParams struct { - /* ID. The identifier of the club. @@ -101,9 +100,7 @@ func (o *GetClubActivitiesByIDParams) WithDefaults() *GetClubActivitiesByIDParam // // All values with no default are reset to their zero value. func (o *GetClubActivitiesByIDParams) SetDefaults() { - var ( - perPageDefault = int64(30) - ) + perPageDefault := int64(30) val := GetClubActivitiesByIDParams{ PerPage: &perPageDefault, @@ -183,7 +180,6 @@ func (o *GetClubActivitiesByIDParams) SetPerPage(perPage *int64) { // WriteToRequest writes these params to a swagger request func (o *GetClubActivitiesByIDParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { - if err := r.SetTimeout(o.timeout); err != nil { return err } @@ -204,7 +200,6 @@ func (o *GetClubActivitiesByIDParams) WriteToRequest(r runtime.ClientRequest, re } qPage := swag.FormatInt64(qrPage) if qPage != "" { - if err := r.SetQueryParam("page", qPage); err != nil { return err } @@ -221,7 +216,6 @@ func (o *GetClubActivitiesByIDParams) WriteToRequest(r runtime.ClientRequest, re } qPerPage := swag.FormatInt64(qrPerPage) if qPerPage != "" { - if err := r.SetQueryParam("per_page", qPerPage); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/clubs/get_club_activities_by_id_responses.go b/internal/gen/strava-api-go/client/clubs/get_club_activities_by_id_responses.go index 873374d..5e1910e 100644 --- a/internal/gen/strava-api-go/client/clubs/get_club_activities_by_id_responses.go +++ b/internal/gen/strava-api-go/client/clubs/get_club_activities_by_id_responses.go @@ -7,6 +7,7 @@ package clubs import ( "encoding/json" + stderrors "errors" "fmt" "io" @@ -22,7 +23,7 @@ type GetClubActivitiesByIDReader struct { } // ReadResponse reads a server response into the received o. -func (o *GetClubActivitiesByIDReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) { +func (o *GetClubActivitiesByIDReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (any, error) { switch response.Code() { case 200: result := NewGetClubActivitiesByIDOK() @@ -101,9 +102,8 @@ func (o *GetClubActivitiesByIDOK) GetPayload() []*models.ClubActivity { } func (o *GetClubActivitiesByIDOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - // response payload - if err := consumer.Consume(response.Body(), &o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), &o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } @@ -173,11 +173,10 @@ func (o *GetClubActivitiesByIDDefault) GetPayload() *models.Fault { } func (o *GetClubActivitiesByIDDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.Fault) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } diff --git a/internal/gen/strava-api-go/client/clubs/get_club_admins_by_id_parameters.go b/internal/gen/strava-api-go/client/clubs/get_club_admins_by_id_parameters.go index 5c078ad..d379767 100644 --- a/internal/gen/strava-api-go/client/clubs/get_club_admins_by_id_parameters.go +++ b/internal/gen/strava-api-go/client/clubs/get_club_admins_by_id_parameters.go @@ -61,7 +61,6 @@ GetClubAdminsByIDParams contains all the parameters to send to the API endpoint Typically these are written to a http.Request. */ type GetClubAdminsByIDParams struct { - /* ID. The identifier of the club. @@ -101,9 +100,7 @@ func (o *GetClubAdminsByIDParams) WithDefaults() *GetClubAdminsByIDParams { // // All values with no default are reset to their zero value. func (o *GetClubAdminsByIDParams) SetDefaults() { - var ( - perPageDefault = int64(30) - ) + perPageDefault := int64(30) val := GetClubAdminsByIDParams{ PerPage: &perPageDefault, @@ -183,7 +180,6 @@ func (o *GetClubAdminsByIDParams) SetPerPage(perPage *int64) { // WriteToRequest writes these params to a swagger request func (o *GetClubAdminsByIDParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { - if err := r.SetTimeout(o.timeout); err != nil { return err } @@ -204,7 +200,6 @@ func (o *GetClubAdminsByIDParams) WriteToRequest(r runtime.ClientRequest, reg st } qPage := swag.FormatInt64(qrPage) if qPage != "" { - if err := r.SetQueryParam("page", qPage); err != nil { return err } @@ -221,7 +216,6 @@ func (o *GetClubAdminsByIDParams) WriteToRequest(r runtime.ClientRequest, reg st } qPerPage := swag.FormatInt64(qrPerPage) if qPerPage != "" { - if err := r.SetQueryParam("per_page", qPerPage); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/clubs/get_club_admins_by_id_responses.go b/internal/gen/strava-api-go/client/clubs/get_club_admins_by_id_responses.go index e8f44ae..b2732cd 100644 --- a/internal/gen/strava-api-go/client/clubs/get_club_admins_by_id_responses.go +++ b/internal/gen/strava-api-go/client/clubs/get_club_admins_by_id_responses.go @@ -7,6 +7,7 @@ package clubs import ( "encoding/json" + stderrors "errors" "fmt" "io" @@ -22,7 +23,7 @@ type GetClubAdminsByIDReader struct { } // ReadResponse reads a server response into the received o. -func (o *GetClubAdminsByIDReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) { +func (o *GetClubAdminsByIDReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (any, error) { switch response.Code() { case 200: result := NewGetClubAdminsByIDOK() @@ -101,9 +102,8 @@ func (o *GetClubAdminsByIDOK) GetPayload() []*models.SummaryAthlete { } func (o *GetClubAdminsByIDOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - // response payload - if err := consumer.Consume(response.Body(), &o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), &o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } @@ -173,11 +173,10 @@ func (o *GetClubAdminsByIDDefault) GetPayload() *models.Fault { } func (o *GetClubAdminsByIDDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.Fault) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } diff --git a/internal/gen/strava-api-go/client/clubs/get_club_by_id_parameters.go b/internal/gen/strava-api-go/client/clubs/get_club_by_id_parameters.go index 42b636a..a7f6ecb 100644 --- a/internal/gen/strava-api-go/client/clubs/get_club_by_id_parameters.go +++ b/internal/gen/strava-api-go/client/clubs/get_club_by_id_parameters.go @@ -61,7 +61,6 @@ GetClubByIDParams contains all the parameters to send to the API endpoint Typically these are written to a http.Request. */ type GetClubByIDParams struct { - /* ID. The identifier of the club. @@ -136,7 +135,6 @@ func (o *GetClubByIDParams) SetID(id int64) { // WriteToRequest writes these params to a swagger request func (o *GetClubByIDParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { - if err := r.SetTimeout(o.timeout); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/clubs/get_club_by_id_responses.go b/internal/gen/strava-api-go/client/clubs/get_club_by_id_responses.go index 1f97a46..45dae63 100644 --- a/internal/gen/strava-api-go/client/clubs/get_club_by_id_responses.go +++ b/internal/gen/strava-api-go/client/clubs/get_club_by_id_responses.go @@ -7,6 +7,7 @@ package clubs import ( "encoding/json" + stderrors "errors" "fmt" "io" @@ -22,7 +23,7 @@ type GetClubByIDReader struct { } // ReadResponse reads a server response into the received o. -func (o *GetClubByIDReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) { +func (o *GetClubByIDReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (any, error) { switch response.Code() { case 200: result := NewGetClubByIDOK() @@ -101,11 +102,10 @@ func (o *GetClubByIDOK) GetPayload() *models.DetailedClub { } func (o *GetClubByIDOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.DetailedClub) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } @@ -175,11 +175,10 @@ func (o *GetClubByIDDefault) GetPayload() *models.Fault { } func (o *GetClubByIDDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.Fault) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } diff --git a/internal/gen/strava-api-go/client/clubs/get_club_members_by_id_parameters.go b/internal/gen/strava-api-go/client/clubs/get_club_members_by_id_parameters.go index 40fe5be..6be33bb 100644 --- a/internal/gen/strava-api-go/client/clubs/get_club_members_by_id_parameters.go +++ b/internal/gen/strava-api-go/client/clubs/get_club_members_by_id_parameters.go @@ -61,7 +61,6 @@ GetClubMembersByIDParams contains all the parameters to send to the API endpoint Typically these are written to a http.Request. */ type GetClubMembersByIDParams struct { - /* ID. The identifier of the club. @@ -101,9 +100,7 @@ func (o *GetClubMembersByIDParams) WithDefaults() *GetClubMembersByIDParams { // // All values with no default are reset to their zero value. func (o *GetClubMembersByIDParams) SetDefaults() { - var ( - perPageDefault = int64(30) - ) + perPageDefault := int64(30) val := GetClubMembersByIDParams{ PerPage: &perPageDefault, @@ -183,7 +180,6 @@ func (o *GetClubMembersByIDParams) SetPerPage(perPage *int64) { // WriteToRequest writes these params to a swagger request func (o *GetClubMembersByIDParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { - if err := r.SetTimeout(o.timeout); err != nil { return err } @@ -204,7 +200,6 @@ func (o *GetClubMembersByIDParams) WriteToRequest(r runtime.ClientRequest, reg s } qPage := swag.FormatInt64(qrPage) if qPage != "" { - if err := r.SetQueryParam("page", qPage); err != nil { return err } @@ -221,7 +216,6 @@ func (o *GetClubMembersByIDParams) WriteToRequest(r runtime.ClientRequest, reg s } qPerPage := swag.FormatInt64(qrPerPage) if qPerPage != "" { - if err := r.SetQueryParam("per_page", qPerPage); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/clubs/get_club_members_by_id_responses.go b/internal/gen/strava-api-go/client/clubs/get_club_members_by_id_responses.go index 3d62852..4824e0e 100644 --- a/internal/gen/strava-api-go/client/clubs/get_club_members_by_id_responses.go +++ b/internal/gen/strava-api-go/client/clubs/get_club_members_by_id_responses.go @@ -7,6 +7,7 @@ package clubs import ( "encoding/json" + stderrors "errors" "fmt" "io" @@ -22,7 +23,7 @@ type GetClubMembersByIDReader struct { } // ReadResponse reads a server response into the received o. -func (o *GetClubMembersByIDReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) { +func (o *GetClubMembersByIDReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (any, error) { switch response.Code() { case 200: result := NewGetClubMembersByIDOK() @@ -101,9 +102,8 @@ func (o *GetClubMembersByIDOK) GetPayload() []*models.ClubAthlete { } func (o *GetClubMembersByIDOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - // response payload - if err := consumer.Consume(response.Body(), &o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), &o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } @@ -173,11 +173,10 @@ func (o *GetClubMembersByIDDefault) GetPayload() *models.Fault { } func (o *GetClubMembersByIDDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.Fault) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } diff --git a/internal/gen/strava-api-go/client/clubs/get_logged_in_athlete_clubs_parameters.go b/internal/gen/strava-api-go/client/clubs/get_logged_in_athlete_clubs_parameters.go index 4eab92a..7dd4862 100644 --- a/internal/gen/strava-api-go/client/clubs/get_logged_in_athlete_clubs_parameters.go +++ b/internal/gen/strava-api-go/client/clubs/get_logged_in_athlete_clubs_parameters.go @@ -61,7 +61,6 @@ GetLoggedInAthleteClubsParams contains all the parameters to send to the API end Typically these are written to a http.Request. */ type GetLoggedInAthleteClubsParams struct { - /* Page. Page number. Defaults to 1. @@ -93,9 +92,7 @@ func (o *GetLoggedInAthleteClubsParams) WithDefaults() *GetLoggedInAthleteClubsP // // All values with no default are reset to their zero value. func (o *GetLoggedInAthleteClubsParams) SetDefaults() { - var ( - perPageDefault = int64(30) - ) + perPageDefault := int64(30) val := GetLoggedInAthleteClubsParams{ PerPage: &perPageDefault, @@ -164,7 +161,6 @@ func (o *GetLoggedInAthleteClubsParams) SetPerPage(perPage *int64) { // WriteToRequest writes these params to a swagger request func (o *GetLoggedInAthleteClubsParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { - if err := r.SetTimeout(o.timeout); err != nil { return err } @@ -180,7 +176,6 @@ func (o *GetLoggedInAthleteClubsParams) WriteToRequest(r runtime.ClientRequest, } qPage := swag.FormatInt64(qrPage) if qPage != "" { - if err := r.SetQueryParam("page", qPage); err != nil { return err } @@ -197,7 +192,6 @@ func (o *GetLoggedInAthleteClubsParams) WriteToRequest(r runtime.ClientRequest, } qPerPage := swag.FormatInt64(qrPerPage) if qPerPage != "" { - if err := r.SetQueryParam("per_page", qPerPage); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/clubs/get_logged_in_athlete_clubs_responses.go b/internal/gen/strava-api-go/client/clubs/get_logged_in_athlete_clubs_responses.go index b8b1064..a9c3509 100644 --- a/internal/gen/strava-api-go/client/clubs/get_logged_in_athlete_clubs_responses.go +++ b/internal/gen/strava-api-go/client/clubs/get_logged_in_athlete_clubs_responses.go @@ -7,6 +7,7 @@ package clubs import ( "encoding/json" + stderrors "errors" "fmt" "io" @@ -22,7 +23,7 @@ type GetLoggedInAthleteClubsReader struct { } // ReadResponse reads a server response into the received o. -func (o *GetLoggedInAthleteClubsReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) { +func (o *GetLoggedInAthleteClubsReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (any, error) { switch response.Code() { case 200: result := NewGetLoggedInAthleteClubsOK() @@ -101,9 +102,8 @@ func (o *GetLoggedInAthleteClubsOK) GetPayload() []*models.SummaryClub { } func (o *GetLoggedInAthleteClubsOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - // response payload - if err := consumer.Consume(response.Body(), &o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), &o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } @@ -173,11 +173,10 @@ func (o *GetLoggedInAthleteClubsDefault) GetPayload() *models.Fault { } func (o *GetLoggedInAthleteClubsDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.Fault) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } diff --git a/internal/gen/strava-api-go/client/gears/gears_client.go b/internal/gen/strava-api-go/client/gears/gears_client.go index 913b188..ca1c728 100644 --- a/internal/gen/strava-api-go/client/gears/gears_client.go +++ b/internal/gen/strava-api-go/client/gears/gears_client.go @@ -65,7 +65,7 @@ GetGearByID gets equipment Returns an equipment using its identifier. */ func (a *Client) GetGearByID(params *GetGearByIDParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*GetGearByIDOK, error) { - // TODO: Validate the params before sending + // NOTE: parameters are not validated before sending if params == nil { params = NewGetGearByIDParams() } @@ -85,17 +85,22 @@ func (a *Client) GetGearByID(params *GetGearByIDParams, authInfo runtime.ClientA for _, opt := range opts { opt(op) } - result, err := a.transport.Submit(op) if err != nil { return nil, err } + + // only one success response has to be checked success, ok := result.(*GetGearByIDOK) if ok { return success, nil } - // unexpected success response + + // unexpected success response. + // + // a default response is provided: fill this and return an error unexpectedSuccess := result.(*GetGearByIDDefault) + return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code()) } diff --git a/internal/gen/strava-api-go/client/gears/get_gear_by_id_parameters.go b/internal/gen/strava-api-go/client/gears/get_gear_by_id_parameters.go index 5debf06..7255ceb 100644 --- a/internal/gen/strava-api-go/client/gears/get_gear_by_id_parameters.go +++ b/internal/gen/strava-api-go/client/gears/get_gear_by_id_parameters.go @@ -60,7 +60,6 @@ GetGearByIDParams contains all the parameters to send to the API endpoint Typically these are written to a http.Request. */ type GetGearByIDParams struct { - /* ID. The identifier of the gear. @@ -133,7 +132,6 @@ func (o *GetGearByIDParams) SetID(id string) { // WriteToRequest writes these params to a swagger request func (o *GetGearByIDParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { - if err := r.SetTimeout(o.timeout); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/gears/get_gear_by_id_responses.go b/internal/gen/strava-api-go/client/gears/get_gear_by_id_responses.go index bcb0318..4bafeca 100644 --- a/internal/gen/strava-api-go/client/gears/get_gear_by_id_responses.go +++ b/internal/gen/strava-api-go/client/gears/get_gear_by_id_responses.go @@ -7,6 +7,7 @@ package gears import ( "encoding/json" + stderrors "errors" "fmt" "io" @@ -22,7 +23,7 @@ type GetGearByIDReader struct { } // ReadResponse reads a server response into the received o. -func (o *GetGearByIDReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) { +func (o *GetGearByIDReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (any, error) { switch response.Code() { case 200: result := NewGetGearByIDOK() @@ -101,11 +102,10 @@ func (o *GetGearByIDOK) GetPayload() *models.DetailedGear { } func (o *GetGearByIDOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.DetailedGear) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } @@ -175,11 +175,10 @@ func (o *GetGearByIDDefault) GetPayload() *models.Fault { } func (o *GetGearByIDDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.Fault) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } diff --git a/internal/gen/strava-api-go/client/routes/get_route_as_g_p_x_parameters.go b/internal/gen/strava-api-go/client/routes/get_route_as_g_p_x_parameters.go index 01468ee..d165943 100644 --- a/internal/gen/strava-api-go/client/routes/get_route_as_g_p_x_parameters.go +++ b/internal/gen/strava-api-go/client/routes/get_route_as_g_p_x_parameters.go @@ -61,7 +61,6 @@ GetRouteAsGPXParams contains all the parameters to send to the API endpoint Typically these are written to a http.Request. */ type GetRouteAsGPXParams struct { - /* ID. The identifier of the route. @@ -136,7 +135,6 @@ func (o *GetRouteAsGPXParams) SetID(id int64) { // WriteToRequest writes these params to a swagger request func (o *GetRouteAsGPXParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { - if err := r.SetTimeout(o.timeout); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/routes/get_route_as_g_p_x_responses.go b/internal/gen/strava-api-go/client/routes/get_route_as_g_p_x_responses.go index 72d04a8..8852eef 100644 --- a/internal/gen/strava-api-go/client/routes/get_route_as_g_p_x_responses.go +++ b/internal/gen/strava-api-go/client/routes/get_route_as_g_p_x_responses.go @@ -7,6 +7,7 @@ package routes import ( "encoding/json" + stderrors "errors" "fmt" "io" @@ -22,7 +23,7 @@ type GetRouteAsGPXReader struct { } // ReadResponse reads a server response into the received o. -func (o *GetRouteAsGPXReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) { +func (o *GetRouteAsGPXReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (any, error) { switch response.Code() { case 200: result := NewGetRouteAsGPXOK() @@ -52,8 +53,7 @@ GetRouteAsGPXOK describes a response with status code 200, with default header v A GPX file with the route. */ -type GetRouteAsGPXOK struct { -} +type GetRouteAsGPXOK struct{} // IsSuccess returns true when this get route as g p x o k response has a 2xx status code func (o *GetRouteAsGPXOK) IsSuccess() bool { @@ -94,7 +94,6 @@ func (o *GetRouteAsGPXOK) String() string { } func (o *GetRouteAsGPXOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - return nil } @@ -161,11 +160,10 @@ func (o *GetRouteAsGPXDefault) GetPayload() *models.Fault { } func (o *GetRouteAsGPXDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.Fault) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } diff --git a/internal/gen/strava-api-go/client/routes/get_route_as_t_c_x_parameters.go b/internal/gen/strava-api-go/client/routes/get_route_as_t_c_x_parameters.go index b0fb9bf..af1ee55 100644 --- a/internal/gen/strava-api-go/client/routes/get_route_as_t_c_x_parameters.go +++ b/internal/gen/strava-api-go/client/routes/get_route_as_t_c_x_parameters.go @@ -61,7 +61,6 @@ GetRouteAsTCXParams contains all the parameters to send to the API endpoint Typically these are written to a http.Request. */ type GetRouteAsTCXParams struct { - /* ID. The identifier of the route. @@ -136,7 +135,6 @@ func (o *GetRouteAsTCXParams) SetID(id int64) { // WriteToRequest writes these params to a swagger request func (o *GetRouteAsTCXParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { - if err := r.SetTimeout(o.timeout); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/routes/get_route_as_t_c_x_responses.go b/internal/gen/strava-api-go/client/routes/get_route_as_t_c_x_responses.go index 030ce15..d9df217 100644 --- a/internal/gen/strava-api-go/client/routes/get_route_as_t_c_x_responses.go +++ b/internal/gen/strava-api-go/client/routes/get_route_as_t_c_x_responses.go @@ -7,6 +7,7 @@ package routes import ( "encoding/json" + stderrors "errors" "fmt" "io" @@ -22,7 +23,7 @@ type GetRouteAsTCXReader struct { } // ReadResponse reads a server response into the received o. -func (o *GetRouteAsTCXReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) { +func (o *GetRouteAsTCXReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (any, error) { switch response.Code() { case 200: result := NewGetRouteAsTCXOK() @@ -52,8 +53,7 @@ GetRouteAsTCXOK describes a response with status code 200, with default header v A TCX file with the route. */ -type GetRouteAsTCXOK struct { -} +type GetRouteAsTCXOK struct{} // IsSuccess returns true when this get route as t c x o k response has a 2xx status code func (o *GetRouteAsTCXOK) IsSuccess() bool { @@ -94,7 +94,6 @@ func (o *GetRouteAsTCXOK) String() string { } func (o *GetRouteAsTCXOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - return nil } @@ -161,11 +160,10 @@ func (o *GetRouteAsTCXDefault) GetPayload() *models.Fault { } func (o *GetRouteAsTCXDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.Fault) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } diff --git a/internal/gen/strava-api-go/client/routes/get_route_by_id_parameters.go b/internal/gen/strava-api-go/client/routes/get_route_by_id_parameters.go index 21a58eb..a7fb3d0 100644 --- a/internal/gen/strava-api-go/client/routes/get_route_by_id_parameters.go +++ b/internal/gen/strava-api-go/client/routes/get_route_by_id_parameters.go @@ -61,7 +61,6 @@ GetRouteByIDParams contains all the parameters to send to the API endpoint Typically these are written to a http.Request. */ type GetRouteByIDParams struct { - /* ID. The identifier of the route. @@ -136,7 +135,6 @@ func (o *GetRouteByIDParams) SetID(id int64) { // WriteToRequest writes these params to a swagger request func (o *GetRouteByIDParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { - if err := r.SetTimeout(o.timeout); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/routes/get_route_by_id_responses.go b/internal/gen/strava-api-go/client/routes/get_route_by_id_responses.go index 03737af..cc38884 100644 --- a/internal/gen/strava-api-go/client/routes/get_route_by_id_responses.go +++ b/internal/gen/strava-api-go/client/routes/get_route_by_id_responses.go @@ -7,6 +7,7 @@ package routes import ( "encoding/json" + stderrors "errors" "fmt" "io" @@ -22,7 +23,7 @@ type GetRouteByIDReader struct { } // ReadResponse reads a server response into the received o. -func (o *GetRouteByIDReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) { +func (o *GetRouteByIDReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (any, error) { switch response.Code() { case 200: result := NewGetRouteByIDOK() @@ -101,11 +102,10 @@ func (o *GetRouteByIDOK) GetPayload() *models.Route { } func (o *GetRouteByIDOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.Route) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } @@ -175,11 +175,10 @@ func (o *GetRouteByIDDefault) GetPayload() *models.Fault { } func (o *GetRouteByIDDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.Fault) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } diff --git a/internal/gen/strava-api-go/client/routes/get_routes_by_athlete_id_parameters.go b/internal/gen/strava-api-go/client/routes/get_routes_by_athlete_id_parameters.go index b410e85..0b43432 100644 --- a/internal/gen/strava-api-go/client/routes/get_routes_by_athlete_id_parameters.go +++ b/internal/gen/strava-api-go/client/routes/get_routes_by_athlete_id_parameters.go @@ -61,7 +61,6 @@ GetRoutesByAthleteIDParams contains all the parameters to send to the API endpoi Typically these are written to a http.Request. */ type GetRoutesByAthleteIDParams struct { - /* Page. Page number. Defaults to 1. @@ -93,9 +92,7 @@ func (o *GetRoutesByAthleteIDParams) WithDefaults() *GetRoutesByAthleteIDParams // // All values with no default are reset to their zero value. func (o *GetRoutesByAthleteIDParams) SetDefaults() { - var ( - perPageDefault = int64(30) - ) + perPageDefault := int64(30) val := GetRoutesByAthleteIDParams{ PerPage: &perPageDefault, @@ -164,7 +161,6 @@ func (o *GetRoutesByAthleteIDParams) SetPerPage(perPage *int64) { // WriteToRequest writes these params to a swagger request func (o *GetRoutesByAthleteIDParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { - if err := r.SetTimeout(o.timeout); err != nil { return err } @@ -180,7 +176,6 @@ func (o *GetRoutesByAthleteIDParams) WriteToRequest(r runtime.ClientRequest, reg } qPage := swag.FormatInt64(qrPage) if qPage != "" { - if err := r.SetQueryParam("page", qPage); err != nil { return err } @@ -197,7 +192,6 @@ func (o *GetRoutesByAthleteIDParams) WriteToRequest(r runtime.ClientRequest, reg } qPerPage := swag.FormatInt64(qrPerPage) if qPerPage != "" { - if err := r.SetQueryParam("per_page", qPerPage); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/routes/get_routes_by_athlete_id_responses.go b/internal/gen/strava-api-go/client/routes/get_routes_by_athlete_id_responses.go index 7e7ccb8..4e4d6c3 100644 --- a/internal/gen/strava-api-go/client/routes/get_routes_by_athlete_id_responses.go +++ b/internal/gen/strava-api-go/client/routes/get_routes_by_athlete_id_responses.go @@ -7,6 +7,7 @@ package routes import ( "encoding/json" + stderrors "errors" "fmt" "io" @@ -22,7 +23,7 @@ type GetRoutesByAthleteIDReader struct { } // ReadResponse reads a server response into the received o. -func (o *GetRoutesByAthleteIDReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) { +func (o *GetRoutesByAthleteIDReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (any, error) { switch response.Code() { case 200: result := NewGetRoutesByAthleteIDOK() @@ -101,9 +102,8 @@ func (o *GetRoutesByAthleteIDOK) GetPayload() []*models.Route { } func (o *GetRoutesByAthleteIDOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - // response payload - if err := consumer.Consume(response.Body(), &o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), &o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } @@ -173,11 +173,10 @@ func (o *GetRoutesByAthleteIDDefault) GetPayload() *models.Fault { } func (o *GetRoutesByAthleteIDDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.Fault) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } diff --git a/internal/gen/strava-api-go/client/routes/routes_client.go b/internal/gen/strava-api-go/client/routes/routes_client.go index 94c3222..28892b5 100644 --- a/internal/gen/strava-api-go/client/routes/routes_client.go +++ b/internal/gen/strava-api-go/client/routes/routes_client.go @@ -71,7 +71,7 @@ GetRouteAsGPX exports route g p x Returns a GPX file of the route. Requires read_all scope for private routes. */ func (a *Client) GetRouteAsGPX(params *GetRouteAsGPXParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*GetRouteAsGPXOK, error) { - // TODO: Validate the params before sending + // NOTE: parameters are not validated before sending if params == nil { params = NewGetRouteAsGPXParams() } @@ -91,17 +91,22 @@ func (a *Client) GetRouteAsGPX(params *GetRouteAsGPXParams, authInfo runtime.Cli for _, opt := range opts { opt(op) } - result, err := a.transport.Submit(op) if err != nil { return nil, err } + + // only one success response has to be checked success, ok := result.(*GetRouteAsGPXOK) if ok { return success, nil } - // unexpected success response + + // unexpected success response. + // + // a default response is provided: fill this and return an error unexpectedSuccess := result.(*GetRouteAsGPXDefault) + return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code()) } @@ -111,7 +116,7 @@ GetRouteAsTCX exports route t c x Returns a TCX file of the route. Requires read_all scope for private routes. */ func (a *Client) GetRouteAsTCX(params *GetRouteAsTCXParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*GetRouteAsTCXOK, error) { - // TODO: Validate the params before sending + // NOTE: parameters are not validated before sending if params == nil { params = NewGetRouteAsTCXParams() } @@ -131,17 +136,22 @@ func (a *Client) GetRouteAsTCX(params *GetRouteAsTCXParams, authInfo runtime.Cli for _, opt := range opts { opt(op) } - result, err := a.transport.Submit(op) if err != nil { return nil, err } + + // only one success response has to be checked success, ok := result.(*GetRouteAsTCXOK) if ok { return success, nil } - // unexpected success response + + // unexpected success response. + // + // a default response is provided: fill this and return an error unexpectedSuccess := result.(*GetRouteAsTCXDefault) + return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code()) } @@ -151,7 +161,7 @@ GetRouteByID gets route Returns a route using its identifier. Requires read_all scope for private routes. */ func (a *Client) GetRouteByID(params *GetRouteByIDParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*GetRouteByIDOK, error) { - // TODO: Validate the params before sending + // NOTE: parameters are not validated before sending if params == nil { params = NewGetRouteByIDParams() } @@ -171,17 +181,22 @@ func (a *Client) GetRouteByID(params *GetRouteByIDParams, authInfo runtime.Clien for _, opt := range opts { opt(op) } - result, err := a.transport.Submit(op) if err != nil { return nil, err } + + // only one success response has to be checked success, ok := result.(*GetRouteByIDOK) if ok { return success, nil } - // unexpected success response + + // unexpected success response. + // + // a default response is provided: fill this and return an error unexpectedSuccess := result.(*GetRouteByIDDefault) + return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code()) } @@ -191,7 +206,7 @@ GetRoutesByAthleteID lists athlete routes Returns a list of the routes created by the authenticated athlete. Private routes are filtered out unless requested by a token with read_all scope. */ func (a *Client) GetRoutesByAthleteID(params *GetRoutesByAthleteIDParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*GetRoutesByAthleteIDOK, error) { - // TODO: Validate the params before sending + // NOTE: parameters are not validated before sending if params == nil { params = NewGetRoutesByAthleteIDParams() } @@ -211,17 +226,22 @@ func (a *Client) GetRoutesByAthleteID(params *GetRoutesByAthleteIDParams, authIn for _, opt := range opts { opt(op) } - result, err := a.transport.Submit(op) if err != nil { return nil, err } + + // only one success response has to be checked success, ok := result.(*GetRoutesByAthleteIDOK) if ok { return success, nil } - // unexpected success response + + // unexpected success response. + // + // a default response is provided: fill this and return an error unexpectedSuccess := result.(*GetRoutesByAthleteIDDefault) + return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code()) } diff --git a/internal/gen/strava-api-go/client/segment_efforts/get_efforts_by_segment_id_parameters.go b/internal/gen/strava-api-go/client/segment_efforts/get_efforts_by_segment_id_parameters.go index 0417be2..fbaae97 100644 --- a/internal/gen/strava-api-go/client/segment_efforts/get_efforts_by_segment_id_parameters.go +++ b/internal/gen/strava-api-go/client/segment_efforts/get_efforts_by_segment_id_parameters.go @@ -61,7 +61,6 @@ GetEffortsBySegmentIDParams contains all the parameters to send to the API endpo Typically these are written to a http.Request. */ type GetEffortsBySegmentIDParams struct { - /* EndDateLocal. ISO 8601 formatted date time. @@ -109,9 +108,7 @@ func (o *GetEffortsBySegmentIDParams) WithDefaults() *GetEffortsBySegmentIDParam // // All values with no default are reset to their zero value. func (o *GetEffortsBySegmentIDParams) SetDefaults() { - var ( - perPageDefault = int64(30) - ) + perPageDefault := int64(30) val := GetEffortsBySegmentIDParams{ PerPage: &perPageDefault, @@ -202,7 +199,6 @@ func (o *GetEffortsBySegmentIDParams) SetStartDateLocal(startDateLocal *strfmt.D // WriteToRequest writes these params to a swagger request func (o *GetEffortsBySegmentIDParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { - if err := r.SetTimeout(o.timeout); err != nil { return err } @@ -218,7 +214,6 @@ func (o *GetEffortsBySegmentIDParams) WriteToRequest(r runtime.ClientRequest, re } qEndDateLocal := qrEndDateLocal.String() if qEndDateLocal != "" { - if err := r.SetQueryParam("end_date_local", qEndDateLocal); err != nil { return err } @@ -235,7 +230,6 @@ func (o *GetEffortsBySegmentIDParams) WriteToRequest(r runtime.ClientRequest, re } qPerPage := swag.FormatInt64(qrPerPage) if qPerPage != "" { - if err := r.SetQueryParam("per_page", qPerPage); err != nil { return err } @@ -246,7 +240,6 @@ func (o *GetEffortsBySegmentIDParams) WriteToRequest(r runtime.ClientRequest, re qrSegmentID := o.SegmentID qSegmentID := swag.FormatInt64(qrSegmentID) if qSegmentID != "" { - if err := r.SetQueryParam("segment_id", qSegmentID); err != nil { return err } @@ -262,7 +255,6 @@ func (o *GetEffortsBySegmentIDParams) WriteToRequest(r runtime.ClientRequest, re } qStartDateLocal := qrStartDateLocal.String() if qStartDateLocal != "" { - if err := r.SetQueryParam("start_date_local", qStartDateLocal); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/segment_efforts/get_efforts_by_segment_id_responses.go b/internal/gen/strava-api-go/client/segment_efforts/get_efforts_by_segment_id_responses.go index 5a8817e..6a28db2 100644 --- a/internal/gen/strava-api-go/client/segment_efforts/get_efforts_by_segment_id_responses.go +++ b/internal/gen/strava-api-go/client/segment_efforts/get_efforts_by_segment_id_responses.go @@ -7,6 +7,7 @@ package segment_efforts import ( "encoding/json" + stderrors "errors" "fmt" "io" @@ -22,7 +23,7 @@ type GetEffortsBySegmentIDReader struct { } // ReadResponse reads a server response into the received o. -func (o *GetEffortsBySegmentIDReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) { +func (o *GetEffortsBySegmentIDReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (any, error) { switch response.Code() { case 200: result := NewGetEffortsBySegmentIDOK() @@ -101,9 +102,8 @@ func (o *GetEffortsBySegmentIDOK) GetPayload() []*models.DetailedSegmentEffort { } func (o *GetEffortsBySegmentIDOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - // response payload - if err := consumer.Consume(response.Body(), &o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), &o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } @@ -173,11 +173,10 @@ func (o *GetEffortsBySegmentIDDefault) GetPayload() *models.Fault { } func (o *GetEffortsBySegmentIDDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.Fault) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } diff --git a/internal/gen/strava-api-go/client/segment_efforts/get_segment_effort_by_id_parameters.go b/internal/gen/strava-api-go/client/segment_efforts/get_segment_effort_by_id_parameters.go index 6a66505..817a2b6 100644 --- a/internal/gen/strava-api-go/client/segment_efforts/get_segment_effort_by_id_parameters.go +++ b/internal/gen/strava-api-go/client/segment_efforts/get_segment_effort_by_id_parameters.go @@ -61,7 +61,6 @@ GetSegmentEffortByIDParams contains all the parameters to send to the API endpoi Typically these are written to a http.Request. */ type GetSegmentEffortByIDParams struct { - /* ID. The identifier of the segment effort. @@ -136,7 +135,6 @@ func (o *GetSegmentEffortByIDParams) SetID(id int64) { // WriteToRequest writes these params to a swagger request func (o *GetSegmentEffortByIDParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { - if err := r.SetTimeout(o.timeout); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/segment_efforts/get_segment_effort_by_id_responses.go b/internal/gen/strava-api-go/client/segment_efforts/get_segment_effort_by_id_responses.go index b476e26..82b1d24 100644 --- a/internal/gen/strava-api-go/client/segment_efforts/get_segment_effort_by_id_responses.go +++ b/internal/gen/strava-api-go/client/segment_efforts/get_segment_effort_by_id_responses.go @@ -7,6 +7,7 @@ package segment_efforts import ( "encoding/json" + stderrors "errors" "fmt" "io" @@ -22,7 +23,7 @@ type GetSegmentEffortByIDReader struct { } // ReadResponse reads a server response into the received o. -func (o *GetSegmentEffortByIDReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) { +func (o *GetSegmentEffortByIDReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (any, error) { switch response.Code() { case 200: result := NewGetSegmentEffortByIDOK() @@ -101,11 +102,10 @@ func (o *GetSegmentEffortByIDOK) GetPayload() *models.DetailedSegmentEffort { } func (o *GetSegmentEffortByIDOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.DetailedSegmentEffort) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } @@ -175,11 +175,10 @@ func (o *GetSegmentEffortByIDDefault) GetPayload() *models.Fault { } func (o *GetSegmentEffortByIDDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.Fault) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } diff --git a/internal/gen/strava-api-go/client/segment_efforts/segment_efforts_client.go b/internal/gen/strava-api-go/client/segment_efforts/segment_efforts_client.go index 1bfb18a..4cef0b5 100644 --- a/internal/gen/strava-api-go/client/segment_efforts/segment_efforts_client.go +++ b/internal/gen/strava-api-go/client/segment_efforts/segment_efforts_client.go @@ -67,7 +67,7 @@ GetEffortsBySegmentID lists segment efforts Returns a set of the authenticated athlete's segment efforts for a given segment. Requires subscription. */ func (a *Client) GetEffortsBySegmentID(params *GetEffortsBySegmentIDParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*GetEffortsBySegmentIDOK, error) { - // TODO: Validate the params before sending + // NOTE: parameters are not validated before sending if params == nil { params = NewGetEffortsBySegmentIDParams() } @@ -87,17 +87,22 @@ func (a *Client) GetEffortsBySegmentID(params *GetEffortsBySegmentIDParams, auth for _, opt := range opts { opt(op) } - result, err := a.transport.Submit(op) if err != nil { return nil, err } + + // only one success response has to be checked success, ok := result.(*GetEffortsBySegmentIDOK) if ok { return success, nil } - // unexpected success response + + // unexpected success response. + // + // a default response is provided: fill this and return an error unexpectedSuccess := result.(*GetEffortsBySegmentIDDefault) + return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code()) } @@ -107,7 +112,7 @@ GetSegmentEffortByID gets segment effort Returns a segment effort from an activity that is owned by the authenticated athlete. Requires subscription. */ func (a *Client) GetSegmentEffortByID(params *GetSegmentEffortByIDParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*GetSegmentEffortByIDOK, error) { - // TODO: Validate the params before sending + // NOTE: parameters are not validated before sending if params == nil { params = NewGetSegmentEffortByIDParams() } @@ -127,17 +132,22 @@ func (a *Client) GetSegmentEffortByID(params *GetSegmentEffortByIDParams, authIn for _, opt := range opts { opt(op) } - result, err := a.transport.Submit(op) if err != nil { return nil, err } + + // only one success response has to be checked success, ok := result.(*GetSegmentEffortByIDOK) if ok { return success, nil } - // unexpected success response + + // unexpected success response. + // + // a default response is provided: fill this and return an error unexpectedSuccess := result.(*GetSegmentEffortByIDDefault) + return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code()) } diff --git a/internal/gen/strava-api-go/client/segments/explore_segments_parameters.go b/internal/gen/strava-api-go/client/segments/explore_segments_parameters.go index f7a0702..73dd9ba 100644 --- a/internal/gen/strava-api-go/client/segments/explore_segments_parameters.go +++ b/internal/gen/strava-api-go/client/segments/explore_segments_parameters.go @@ -61,7 +61,6 @@ ExploreSegmentsParams contains all the parameters to send to the API endpoint Typically these are written to a http.Request. */ type ExploreSegmentsParams struct { - /* ActivityType. Desired activity type. @@ -185,7 +184,6 @@ func (o *ExploreSegmentsParams) SetMinCat(minCat *int64) { // WriteToRequest writes these params to a swagger request func (o *ExploreSegmentsParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { - if err := r.SetTimeout(o.timeout); err != nil { return err } @@ -201,7 +199,6 @@ func (o *ExploreSegmentsParams) WriteToRequest(r runtime.ClientRequest, reg strf } qActivityType := qrActivityType if qActivityType != "" { - if err := r.SetQueryParam("activity_type", qActivityType); err != nil { return err } @@ -229,7 +226,6 @@ func (o *ExploreSegmentsParams) WriteToRequest(r runtime.ClientRequest, reg strf } qMaxCat := swag.FormatInt64(qrMaxCat) if qMaxCat != "" { - if err := r.SetQueryParam("max_cat", qMaxCat); err != nil { return err } @@ -246,7 +242,6 @@ func (o *ExploreSegmentsParams) WriteToRequest(r runtime.ClientRequest, reg strf } qMinCat := swag.FormatInt64(qrMinCat) if qMinCat != "" { - if err := r.SetQueryParam("min_cat", qMinCat); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/segments/explore_segments_responses.go b/internal/gen/strava-api-go/client/segments/explore_segments_responses.go index 19db080..db39da4 100644 --- a/internal/gen/strava-api-go/client/segments/explore_segments_responses.go +++ b/internal/gen/strava-api-go/client/segments/explore_segments_responses.go @@ -7,6 +7,7 @@ package segments import ( "encoding/json" + stderrors "errors" "fmt" "io" @@ -22,7 +23,7 @@ type ExploreSegmentsReader struct { } // ReadResponse reads a server response into the received o. -func (o *ExploreSegmentsReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) { +func (o *ExploreSegmentsReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (any, error) { switch response.Code() { case 200: result := NewExploreSegmentsOK() @@ -101,11 +102,10 @@ func (o *ExploreSegmentsOK) GetPayload() *models.ExplorerResponse { } func (o *ExploreSegmentsOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.ExplorerResponse) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } @@ -175,11 +175,10 @@ func (o *ExploreSegmentsDefault) GetPayload() *models.Fault { } func (o *ExploreSegmentsDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.Fault) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } diff --git a/internal/gen/strava-api-go/client/segments/get_logged_in_athlete_starred_segments_parameters.go b/internal/gen/strava-api-go/client/segments/get_logged_in_athlete_starred_segments_parameters.go index 18db5fb..b44ca68 100644 --- a/internal/gen/strava-api-go/client/segments/get_logged_in_athlete_starred_segments_parameters.go +++ b/internal/gen/strava-api-go/client/segments/get_logged_in_athlete_starred_segments_parameters.go @@ -61,7 +61,6 @@ GetLoggedInAthleteStarredSegmentsParams contains all the parameters to send to t Typically these are written to a http.Request. */ type GetLoggedInAthleteStarredSegmentsParams struct { - /* Page. Page number. Defaults to 1. @@ -93,9 +92,7 @@ func (o *GetLoggedInAthleteStarredSegmentsParams) WithDefaults() *GetLoggedInAth // // All values with no default are reset to their zero value. func (o *GetLoggedInAthleteStarredSegmentsParams) SetDefaults() { - var ( - perPageDefault = int64(30) - ) + perPageDefault := int64(30) val := GetLoggedInAthleteStarredSegmentsParams{ PerPage: &perPageDefault, @@ -164,7 +161,6 @@ func (o *GetLoggedInAthleteStarredSegmentsParams) SetPerPage(perPage *int64) { // WriteToRequest writes these params to a swagger request func (o *GetLoggedInAthleteStarredSegmentsParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { - if err := r.SetTimeout(o.timeout); err != nil { return err } @@ -180,7 +176,6 @@ func (o *GetLoggedInAthleteStarredSegmentsParams) WriteToRequest(r runtime.Clien } qPage := swag.FormatInt64(qrPage) if qPage != "" { - if err := r.SetQueryParam("page", qPage); err != nil { return err } @@ -197,7 +192,6 @@ func (o *GetLoggedInAthleteStarredSegmentsParams) WriteToRequest(r runtime.Clien } qPerPage := swag.FormatInt64(qrPerPage) if qPerPage != "" { - if err := r.SetQueryParam("per_page", qPerPage); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/segments/get_logged_in_athlete_starred_segments_responses.go b/internal/gen/strava-api-go/client/segments/get_logged_in_athlete_starred_segments_responses.go index b576cc7..ada5e48 100644 --- a/internal/gen/strava-api-go/client/segments/get_logged_in_athlete_starred_segments_responses.go +++ b/internal/gen/strava-api-go/client/segments/get_logged_in_athlete_starred_segments_responses.go @@ -7,6 +7,7 @@ package segments import ( "encoding/json" + stderrors "errors" "fmt" "io" @@ -22,7 +23,7 @@ type GetLoggedInAthleteStarredSegmentsReader struct { } // ReadResponse reads a server response into the received o. -func (o *GetLoggedInAthleteStarredSegmentsReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) { +func (o *GetLoggedInAthleteStarredSegmentsReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (any, error) { switch response.Code() { case 200: result := NewGetLoggedInAthleteStarredSegmentsOK() @@ -101,9 +102,8 @@ func (o *GetLoggedInAthleteStarredSegmentsOK) GetPayload() []*models.SummarySegm } func (o *GetLoggedInAthleteStarredSegmentsOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - // response payload - if err := consumer.Consume(response.Body(), &o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), &o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } @@ -173,11 +173,10 @@ func (o *GetLoggedInAthleteStarredSegmentsDefault) GetPayload() *models.Fault { } func (o *GetLoggedInAthleteStarredSegmentsDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.Fault) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } diff --git a/internal/gen/strava-api-go/client/segments/get_segment_by_id_parameters.go b/internal/gen/strava-api-go/client/segments/get_segment_by_id_parameters.go index 598d077..6af7a83 100644 --- a/internal/gen/strava-api-go/client/segments/get_segment_by_id_parameters.go +++ b/internal/gen/strava-api-go/client/segments/get_segment_by_id_parameters.go @@ -61,7 +61,6 @@ GetSegmentByIDParams contains all the parameters to send to the API endpoint Typically these are written to a http.Request. */ type GetSegmentByIDParams struct { - /* ID. The identifier of the segment. @@ -136,7 +135,6 @@ func (o *GetSegmentByIDParams) SetID(id int64) { // WriteToRequest writes these params to a swagger request func (o *GetSegmentByIDParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { - if err := r.SetTimeout(o.timeout); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/segments/get_segment_by_id_responses.go b/internal/gen/strava-api-go/client/segments/get_segment_by_id_responses.go index 2c9a058..0d37f1b 100644 --- a/internal/gen/strava-api-go/client/segments/get_segment_by_id_responses.go +++ b/internal/gen/strava-api-go/client/segments/get_segment_by_id_responses.go @@ -7,6 +7,7 @@ package segments import ( "encoding/json" + stderrors "errors" "fmt" "io" @@ -22,7 +23,7 @@ type GetSegmentByIDReader struct { } // ReadResponse reads a server response into the received o. -func (o *GetSegmentByIDReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) { +func (o *GetSegmentByIDReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (any, error) { switch response.Code() { case 200: result := NewGetSegmentByIDOK() @@ -101,11 +102,10 @@ func (o *GetSegmentByIDOK) GetPayload() *models.DetailedSegment { } func (o *GetSegmentByIDOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.DetailedSegment) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } @@ -175,11 +175,10 @@ func (o *GetSegmentByIDDefault) GetPayload() *models.Fault { } func (o *GetSegmentByIDDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.Fault) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } diff --git a/internal/gen/strava-api-go/client/segments/segments_client.go b/internal/gen/strava-api-go/client/segments/segments_client.go index 50db9f3..9b96ff1 100644 --- a/internal/gen/strava-api-go/client/segments/segments_client.go +++ b/internal/gen/strava-api-go/client/segments/segments_client.go @@ -71,7 +71,7 @@ ExploreSegments explores segments Returns the top 10 segments matching a specified query. */ func (a *Client) ExploreSegments(params *ExploreSegmentsParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*ExploreSegmentsOK, error) { - // TODO: Validate the params before sending + // NOTE: parameters are not validated before sending if params == nil { params = NewExploreSegmentsParams() } @@ -91,17 +91,22 @@ func (a *Client) ExploreSegments(params *ExploreSegmentsParams, authInfo runtime for _, opt := range opts { opt(op) } - result, err := a.transport.Submit(op) if err != nil { return nil, err } + + // only one success response has to be checked success, ok := result.(*ExploreSegmentsOK) if ok { return success, nil } - // unexpected success response + + // unexpected success response. + // + // a default response is provided: fill this and return an error unexpectedSuccess := result.(*ExploreSegmentsDefault) + return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code()) } @@ -111,7 +116,7 @@ GetLoggedInAthleteStarredSegments lists starred segments List of the authenticated athlete's starred segments. Private segments are filtered out unless requested by a token with read_all scope. */ func (a *Client) GetLoggedInAthleteStarredSegments(params *GetLoggedInAthleteStarredSegmentsParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*GetLoggedInAthleteStarredSegmentsOK, error) { - // TODO: Validate the params before sending + // NOTE: parameters are not validated before sending if params == nil { params = NewGetLoggedInAthleteStarredSegmentsParams() } @@ -131,17 +136,22 @@ func (a *Client) GetLoggedInAthleteStarredSegments(params *GetLoggedInAthleteSta for _, opt := range opts { opt(op) } - result, err := a.transport.Submit(op) if err != nil { return nil, err } + + // only one success response has to be checked success, ok := result.(*GetLoggedInAthleteStarredSegmentsOK) if ok { return success, nil } - // unexpected success response + + // unexpected success response. + // + // a default response is provided: fill this and return an error unexpectedSuccess := result.(*GetLoggedInAthleteStarredSegmentsDefault) + return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code()) } @@ -151,7 +161,7 @@ GetSegmentByID gets segment Returns the specified segment. read_all scope required in order to retrieve athlete-specific segment information, or to retrieve private segments. */ func (a *Client) GetSegmentByID(params *GetSegmentByIDParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*GetSegmentByIDOK, error) { - // TODO: Validate the params before sending + // NOTE: parameters are not validated before sending if params == nil { params = NewGetSegmentByIDParams() } @@ -171,17 +181,22 @@ func (a *Client) GetSegmentByID(params *GetSegmentByIDParams, authInfo runtime.C for _, opt := range opts { opt(op) } - result, err := a.transport.Submit(op) if err != nil { return nil, err } + + // only one success response has to be checked success, ok := result.(*GetSegmentByIDOK) if ok { return success, nil } - // unexpected success response + + // unexpected success response. + // + // a default response is provided: fill this and return an error unexpectedSuccess := result.(*GetSegmentByIDDefault) + return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code()) } @@ -191,7 +206,7 @@ StarSegment stars segment Stars/Unstars the given segment for the authenticated athlete. Requires profile:write scope. */ func (a *Client) StarSegment(params *StarSegmentParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*StarSegmentOK, error) { - // TODO: Validate the params before sending + // NOTE: parameters are not validated before sending if params == nil { params = NewStarSegmentParams() } @@ -211,17 +226,22 @@ func (a *Client) StarSegment(params *StarSegmentParams, authInfo runtime.ClientA for _, opt := range opts { opt(op) } - result, err := a.transport.Submit(op) if err != nil { return nil, err } + + // only one success response has to be checked success, ok := result.(*StarSegmentOK) if ok { return success, nil } - // unexpected success response + + // unexpected success response. + // + // a default response is provided: fill this and return an error unexpectedSuccess := result.(*StarSegmentDefault) + return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code()) } diff --git a/internal/gen/strava-api-go/client/segments/star_segment_parameters.go b/internal/gen/strava-api-go/client/segments/star_segment_parameters.go index 225a04b..0535c28 100644 --- a/internal/gen/strava-api-go/client/segments/star_segment_parameters.go +++ b/internal/gen/strava-api-go/client/segments/star_segment_parameters.go @@ -61,7 +61,6 @@ StarSegmentParams contains all the parameters to send to the API endpoint Typically these are written to a http.Request. */ type StarSegmentParams struct { - /* ID. The identifier of the segment to star. @@ -93,9 +92,7 @@ func (o *StarSegmentParams) WithDefaults() *StarSegmentParams { // // All values with no default are reset to their zero value. func (o *StarSegmentParams) SetDefaults() { - var ( - starredDefault = bool(false) - ) + starredDefault := bool(false) val := StarSegmentParams{ Starred: starredDefault, @@ -164,7 +161,6 @@ func (o *StarSegmentParams) SetStarred(starred bool) { // WriteToRequest writes these params to a swagger request func (o *StarSegmentParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { - if err := r.SetTimeout(o.timeout); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/segments/star_segment_responses.go b/internal/gen/strava-api-go/client/segments/star_segment_responses.go index 16d744e..4a8397d 100644 --- a/internal/gen/strava-api-go/client/segments/star_segment_responses.go +++ b/internal/gen/strava-api-go/client/segments/star_segment_responses.go @@ -7,6 +7,7 @@ package segments import ( "encoding/json" + stderrors "errors" "fmt" "io" @@ -22,7 +23,7 @@ type StarSegmentReader struct { } // ReadResponse reads a server response into the received o. -func (o *StarSegmentReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) { +func (o *StarSegmentReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (any, error) { switch response.Code() { case 200: result := NewStarSegmentOK() @@ -101,11 +102,10 @@ func (o *StarSegmentOK) GetPayload() *models.DetailedSegment { } func (o *StarSegmentOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.DetailedSegment) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } @@ -175,11 +175,10 @@ func (o *StarSegmentDefault) GetPayload() *models.Fault { } func (o *StarSegmentDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.Fault) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } diff --git a/internal/gen/strava-api-go/client/streams/get_activity_streams_parameters.go b/internal/gen/strava-api-go/client/streams/get_activity_streams_parameters.go index ce9586f..26c9798 100644 --- a/internal/gen/strava-api-go/client/streams/get_activity_streams_parameters.go +++ b/internal/gen/strava-api-go/client/streams/get_activity_streams_parameters.go @@ -61,7 +61,6 @@ GetActivityStreamsParams contains all the parameters to send to the API endpoint Typically these are written to a http.Request. */ type GetActivityStreamsParams struct { - /* ID. The identifier of the activity. @@ -101,9 +100,7 @@ func (o *GetActivityStreamsParams) WithDefaults() *GetActivityStreamsParams { // // All values with no default are reset to their zero value. func (o *GetActivityStreamsParams) SetDefaults() { - var ( - keyByTypeDefault = bool(true) - ) + keyByTypeDefault := bool(true) val := GetActivityStreamsParams{ KeyByType: keyByTypeDefault, @@ -183,7 +180,6 @@ func (o *GetActivityStreamsParams) SetKeys(keys []string) { // WriteToRequest writes these params to a swagger request func (o *GetActivityStreamsParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { - if err := r.SetTimeout(o.timeout); err != nil { return err } @@ -198,7 +194,6 @@ func (o *GetActivityStreamsParams) WriteToRequest(r runtime.ClientRequest, reg s qrKeyByType := o.KeyByType qKeyByType := swag.FormatBool(qrKeyByType) if qKeyByType != "" { - if err := r.SetQueryParam("key_by_type", qKeyByType); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/streams/get_activity_streams_responses.go b/internal/gen/strava-api-go/client/streams/get_activity_streams_responses.go index 38a8460..539f379 100644 --- a/internal/gen/strava-api-go/client/streams/get_activity_streams_responses.go +++ b/internal/gen/strava-api-go/client/streams/get_activity_streams_responses.go @@ -7,6 +7,7 @@ package streams import ( "encoding/json" + stderrors "errors" "fmt" "io" @@ -22,7 +23,7 @@ type GetActivityStreamsReader struct { } // ReadResponse reads a server response into the received o. -func (o *GetActivityStreamsReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) { +func (o *GetActivityStreamsReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (any, error) { switch response.Code() { case 200: result := NewGetActivityStreamsOK() @@ -101,11 +102,10 @@ func (o *GetActivityStreamsOK) GetPayload() *models.StreamSet { } func (o *GetActivityStreamsOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.StreamSet) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } @@ -175,11 +175,10 @@ func (o *GetActivityStreamsDefault) GetPayload() *models.Fault { } func (o *GetActivityStreamsDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.Fault) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } diff --git a/internal/gen/strava-api-go/client/streams/get_route_streams_parameters.go b/internal/gen/strava-api-go/client/streams/get_route_streams_parameters.go index 04651ae..6046ae5 100644 --- a/internal/gen/strava-api-go/client/streams/get_route_streams_parameters.go +++ b/internal/gen/strava-api-go/client/streams/get_route_streams_parameters.go @@ -61,7 +61,6 @@ GetRouteStreamsParams contains all the parameters to send to the API endpoint Typically these are written to a http.Request. */ type GetRouteStreamsParams struct { - /* ID. The identifier of the route. @@ -136,7 +135,6 @@ func (o *GetRouteStreamsParams) SetID(id int64) { // WriteToRequest writes these params to a swagger request func (o *GetRouteStreamsParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { - if err := r.SetTimeout(o.timeout); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/streams/get_route_streams_responses.go b/internal/gen/strava-api-go/client/streams/get_route_streams_responses.go index 7731d07..31502a6 100644 --- a/internal/gen/strava-api-go/client/streams/get_route_streams_responses.go +++ b/internal/gen/strava-api-go/client/streams/get_route_streams_responses.go @@ -7,6 +7,7 @@ package streams import ( "encoding/json" + stderrors "errors" "fmt" "io" @@ -22,7 +23,7 @@ type GetRouteStreamsReader struct { } // ReadResponse reads a server response into the received o. -func (o *GetRouteStreamsReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) { +func (o *GetRouteStreamsReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (any, error) { switch response.Code() { case 200: result := NewGetRouteStreamsOK() @@ -101,11 +102,10 @@ func (o *GetRouteStreamsOK) GetPayload() *models.StreamSet { } func (o *GetRouteStreamsOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.StreamSet) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } @@ -175,11 +175,10 @@ func (o *GetRouteStreamsDefault) GetPayload() *models.Fault { } func (o *GetRouteStreamsDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.Fault) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } diff --git a/internal/gen/strava-api-go/client/streams/get_segment_effort_streams_parameters.go b/internal/gen/strava-api-go/client/streams/get_segment_effort_streams_parameters.go index bfb0020..82d50b5 100644 --- a/internal/gen/strava-api-go/client/streams/get_segment_effort_streams_parameters.go +++ b/internal/gen/strava-api-go/client/streams/get_segment_effort_streams_parameters.go @@ -61,7 +61,6 @@ GetSegmentEffortStreamsParams contains all the parameters to send to the API end Typically these are written to a http.Request. */ type GetSegmentEffortStreamsParams struct { - /* ID. The identifier of the segment effort. @@ -101,9 +100,7 @@ func (o *GetSegmentEffortStreamsParams) WithDefaults() *GetSegmentEffortStreamsP // // All values with no default are reset to their zero value. func (o *GetSegmentEffortStreamsParams) SetDefaults() { - var ( - keyByTypeDefault = bool(true) - ) + keyByTypeDefault := bool(true) val := GetSegmentEffortStreamsParams{ KeyByType: keyByTypeDefault, @@ -183,7 +180,6 @@ func (o *GetSegmentEffortStreamsParams) SetKeys(keys []string) { // WriteToRequest writes these params to a swagger request func (o *GetSegmentEffortStreamsParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { - if err := r.SetTimeout(o.timeout); err != nil { return err } @@ -198,7 +194,6 @@ func (o *GetSegmentEffortStreamsParams) WriteToRequest(r runtime.ClientRequest, qrKeyByType := o.KeyByType qKeyByType := swag.FormatBool(qrKeyByType) if qKeyByType != "" { - if err := r.SetQueryParam("key_by_type", qKeyByType); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/streams/get_segment_effort_streams_responses.go b/internal/gen/strava-api-go/client/streams/get_segment_effort_streams_responses.go index 1a92662..a42cb67 100644 --- a/internal/gen/strava-api-go/client/streams/get_segment_effort_streams_responses.go +++ b/internal/gen/strava-api-go/client/streams/get_segment_effort_streams_responses.go @@ -7,6 +7,7 @@ package streams import ( "encoding/json" + stderrors "errors" "fmt" "io" @@ -22,7 +23,7 @@ type GetSegmentEffortStreamsReader struct { } // ReadResponse reads a server response into the received o. -func (o *GetSegmentEffortStreamsReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) { +func (o *GetSegmentEffortStreamsReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (any, error) { switch response.Code() { case 200: result := NewGetSegmentEffortStreamsOK() @@ -101,11 +102,10 @@ func (o *GetSegmentEffortStreamsOK) GetPayload() *models.StreamSet { } func (o *GetSegmentEffortStreamsOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.StreamSet) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } @@ -175,11 +175,10 @@ func (o *GetSegmentEffortStreamsDefault) GetPayload() *models.Fault { } func (o *GetSegmentEffortStreamsDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.Fault) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } diff --git a/internal/gen/strava-api-go/client/streams/get_segment_streams_parameters.go b/internal/gen/strava-api-go/client/streams/get_segment_streams_parameters.go index 3c8b07b..544dea0 100644 --- a/internal/gen/strava-api-go/client/streams/get_segment_streams_parameters.go +++ b/internal/gen/strava-api-go/client/streams/get_segment_streams_parameters.go @@ -61,7 +61,6 @@ GetSegmentStreamsParams contains all the parameters to send to the API endpoint Typically these are written to a http.Request. */ type GetSegmentStreamsParams struct { - /* ID. The identifier of the segment. @@ -101,9 +100,7 @@ func (o *GetSegmentStreamsParams) WithDefaults() *GetSegmentStreamsParams { // // All values with no default are reset to their zero value. func (o *GetSegmentStreamsParams) SetDefaults() { - var ( - keyByTypeDefault = bool(true) - ) + keyByTypeDefault := bool(true) val := GetSegmentStreamsParams{ KeyByType: keyByTypeDefault, @@ -183,7 +180,6 @@ func (o *GetSegmentStreamsParams) SetKeys(keys []string) { // WriteToRequest writes these params to a swagger request func (o *GetSegmentStreamsParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { - if err := r.SetTimeout(o.timeout); err != nil { return err } @@ -198,7 +194,6 @@ func (o *GetSegmentStreamsParams) WriteToRequest(r runtime.ClientRequest, reg st qrKeyByType := o.KeyByType qKeyByType := swag.FormatBool(qrKeyByType) if qKeyByType != "" { - if err := r.SetQueryParam("key_by_type", qKeyByType); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/streams/get_segment_streams_responses.go b/internal/gen/strava-api-go/client/streams/get_segment_streams_responses.go index d7b91d2..4325e7f 100644 --- a/internal/gen/strava-api-go/client/streams/get_segment_streams_responses.go +++ b/internal/gen/strava-api-go/client/streams/get_segment_streams_responses.go @@ -7,6 +7,7 @@ package streams import ( "encoding/json" + stderrors "errors" "fmt" "io" @@ -22,7 +23,7 @@ type GetSegmentStreamsReader struct { } // ReadResponse reads a server response into the received o. -func (o *GetSegmentStreamsReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) { +func (o *GetSegmentStreamsReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (any, error) { switch response.Code() { case 200: result := NewGetSegmentStreamsOK() @@ -101,11 +102,10 @@ func (o *GetSegmentStreamsOK) GetPayload() *models.StreamSet { } func (o *GetSegmentStreamsOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.StreamSet) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } @@ -175,11 +175,10 @@ func (o *GetSegmentStreamsDefault) GetPayload() *models.Fault { } func (o *GetSegmentStreamsDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.Fault) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } diff --git a/internal/gen/strava-api-go/client/streams/streams_client.go b/internal/gen/strava-api-go/client/streams/streams_client.go index 88fe600..bc56f1e 100644 --- a/internal/gen/strava-api-go/client/streams/streams_client.go +++ b/internal/gen/strava-api-go/client/streams/streams_client.go @@ -71,7 +71,7 @@ GetActivityStreams gets activity streams Returns the given activity's streams. Requires activity:read scope. Requires activity:read_all scope for Only Me activities. */ func (a *Client) GetActivityStreams(params *GetActivityStreamsParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*GetActivityStreamsOK, error) { - // TODO: Validate the params before sending + // NOTE: parameters are not validated before sending if params == nil { params = NewGetActivityStreamsParams() } @@ -91,17 +91,22 @@ func (a *Client) GetActivityStreams(params *GetActivityStreamsParams, authInfo r for _, opt := range opts { opt(op) } - result, err := a.transport.Submit(op) if err != nil { return nil, err } + + // only one success response has to be checked success, ok := result.(*GetActivityStreamsOK) if ok { return success, nil } - // unexpected success response + + // unexpected success response. + // + // a default response is provided: fill this and return an error unexpectedSuccess := result.(*GetActivityStreamsDefault) + return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code()) } @@ -111,7 +116,7 @@ GetRouteStreams gets route streams Returns the given route's streams. Requires read_all scope for private routes. */ func (a *Client) GetRouteStreams(params *GetRouteStreamsParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*GetRouteStreamsOK, error) { - // TODO: Validate the params before sending + // NOTE: parameters are not validated before sending if params == nil { params = NewGetRouteStreamsParams() } @@ -131,17 +136,22 @@ func (a *Client) GetRouteStreams(params *GetRouteStreamsParams, authInfo runtime for _, opt := range opts { opt(op) } - result, err := a.transport.Submit(op) if err != nil { return nil, err } + + // only one success response has to be checked success, ok := result.(*GetRouteStreamsOK) if ok { return success, nil } - // unexpected success response + + // unexpected success response. + // + // a default response is provided: fill this and return an error unexpectedSuccess := result.(*GetRouteStreamsDefault) + return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code()) } @@ -151,7 +161,7 @@ GetSegmentEffortStreams gets segment effort streams Returns a set of streams for a segment effort completed by the authenticated athlete. Requires read_all scope. */ func (a *Client) GetSegmentEffortStreams(params *GetSegmentEffortStreamsParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*GetSegmentEffortStreamsOK, error) { - // TODO: Validate the params before sending + // NOTE: parameters are not validated before sending if params == nil { params = NewGetSegmentEffortStreamsParams() } @@ -171,17 +181,22 @@ func (a *Client) GetSegmentEffortStreams(params *GetSegmentEffortStreamsParams, for _, opt := range opts { opt(op) } - result, err := a.transport.Submit(op) if err != nil { return nil, err } + + // only one success response has to be checked success, ok := result.(*GetSegmentEffortStreamsOK) if ok { return success, nil } - // unexpected success response + + // unexpected success response. + // + // a default response is provided: fill this and return an error unexpectedSuccess := result.(*GetSegmentEffortStreamsDefault) + return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code()) } @@ -191,7 +206,7 @@ GetSegmentStreams gets segment streams Returns the given segment's streams. Requires read_all scope for private segments. */ func (a *Client) GetSegmentStreams(params *GetSegmentStreamsParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*GetSegmentStreamsOK, error) { - // TODO: Validate the params before sending + // NOTE: parameters are not validated before sending if params == nil { params = NewGetSegmentStreamsParams() } @@ -211,17 +226,22 @@ func (a *Client) GetSegmentStreams(params *GetSegmentStreamsParams, authInfo run for _, opt := range opts { opt(op) } - result, err := a.transport.Submit(op) if err != nil { return nil, err } + + // only one success response has to be checked success, ok := result.(*GetSegmentStreamsOK) if ok { return success, nil } - // unexpected success response + + // unexpected success response. + // + // a default response is provided: fill this and return an error unexpectedSuccess := result.(*GetSegmentStreamsDefault) + return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code()) } diff --git a/internal/gen/strava-api-go/client/uploads/create_upload_parameters.go b/internal/gen/strava-api-go/client/uploads/create_upload_parameters.go index 49a2b12..b893a33 100644 --- a/internal/gen/strava-api-go/client/uploads/create_upload_parameters.go +++ b/internal/gen/strava-api-go/client/uploads/create_upload_parameters.go @@ -60,7 +60,6 @@ CreateUploadParams contains all the parameters to send to the API endpoint Typically these are written to a http.Request. */ type CreateUploadParams struct { - /* Commute. Whether the resulting activity should be tagged as a commute. @@ -235,7 +234,6 @@ func (o *CreateUploadParams) SetTrainer(trainer *string) { // WriteToRequest writes these params to a swagger request func (o *CreateUploadParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { - if err := r.SetTimeout(o.timeout); err != nil { return err } @@ -302,7 +300,6 @@ func (o *CreateUploadParams) WriteToRequest(r runtime.ClientRequest, reg strfmt. } if o.File != nil { - if o.File != nil { // form file param file if err := r.SetFileParam("file", o.File); err != nil { diff --git a/internal/gen/strava-api-go/client/uploads/create_upload_responses.go b/internal/gen/strava-api-go/client/uploads/create_upload_responses.go index 4ed5b5a..e9ee021 100644 --- a/internal/gen/strava-api-go/client/uploads/create_upload_responses.go +++ b/internal/gen/strava-api-go/client/uploads/create_upload_responses.go @@ -7,6 +7,7 @@ package uploads import ( "encoding/json" + stderrors "errors" "fmt" "io" @@ -22,7 +23,7 @@ type CreateUploadReader struct { } // ReadResponse reads a server response into the received o. -func (o *CreateUploadReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) { +func (o *CreateUploadReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (any, error) { switch response.Code() { case 201: result := NewCreateUploadCreated() @@ -101,11 +102,10 @@ func (o *CreateUploadCreated) GetPayload() *models.Upload { } func (o *CreateUploadCreated) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.Upload) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } @@ -175,11 +175,10 @@ func (o *CreateUploadDefault) GetPayload() *models.Fault { } func (o *CreateUploadDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.Fault) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } diff --git a/internal/gen/strava-api-go/client/uploads/get_upload_by_id_parameters.go b/internal/gen/strava-api-go/client/uploads/get_upload_by_id_parameters.go index 4e179df..579ab82 100644 --- a/internal/gen/strava-api-go/client/uploads/get_upload_by_id_parameters.go +++ b/internal/gen/strava-api-go/client/uploads/get_upload_by_id_parameters.go @@ -61,7 +61,6 @@ GetUploadByIDParams contains all the parameters to send to the API endpoint Typically these are written to a http.Request. */ type GetUploadByIDParams struct { - /* UploadID. The identifier of the upload. @@ -136,7 +135,6 @@ func (o *GetUploadByIDParams) SetUploadID(uploadID int64) { // WriteToRequest writes these params to a swagger request func (o *GetUploadByIDParams) WriteToRequest(r runtime.ClientRequest, reg strfmt.Registry) error { - if err := r.SetTimeout(o.timeout); err != nil { return err } diff --git a/internal/gen/strava-api-go/client/uploads/get_upload_by_id_responses.go b/internal/gen/strava-api-go/client/uploads/get_upload_by_id_responses.go index 9a0e0fc..12a0a64 100644 --- a/internal/gen/strava-api-go/client/uploads/get_upload_by_id_responses.go +++ b/internal/gen/strava-api-go/client/uploads/get_upload_by_id_responses.go @@ -7,6 +7,7 @@ package uploads import ( "encoding/json" + stderrors "errors" "fmt" "io" @@ -22,7 +23,7 @@ type GetUploadByIDReader struct { } // ReadResponse reads a server response into the received o. -func (o *GetUploadByIDReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (interface{}, error) { +func (o *GetUploadByIDReader) ReadResponse(response runtime.ClientResponse, consumer runtime.Consumer) (any, error) { switch response.Code() { case 200: result := NewGetUploadByIDOK() @@ -101,11 +102,10 @@ func (o *GetUploadByIDOK) GetPayload() *models.Upload { } func (o *GetUploadByIDOK) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.Upload) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } @@ -175,11 +175,10 @@ func (o *GetUploadByIDDefault) GetPayload() *models.Fault { } func (o *GetUploadByIDDefault) readResponse(response runtime.ClientResponse, consumer runtime.Consumer, formats strfmt.Registry) error { - o.Payload = new(models.Fault) // response payload - if err := consumer.Consume(response.Body(), o.Payload); err != nil && err != io.EOF { + if err := consumer.Consume(response.Body(), o.Payload); err != nil && !stderrors.Is(err, io.EOF) { return err } diff --git a/internal/gen/strava-api-go/client/uploads/uploads_client.go b/internal/gen/strava-api-go/client/uploads/uploads_client.go index e37afe9..190c524 100644 --- a/internal/gen/strava-api-go/client/uploads/uploads_client.go +++ b/internal/gen/strava-api-go/client/uploads/uploads_client.go @@ -91,7 +91,7 @@ CreateUpload uploads activity Uploads a new data file to create an activity from. Requires activity:write scope. */ func (a *Client) CreateUpload(params *CreateUploadParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*CreateUploadCreated, error) { - // TODO: Validate the params before sending + // NOTE: parameters are not validated before sending if params == nil { params = NewCreateUploadParams() } @@ -111,17 +111,22 @@ func (a *Client) CreateUpload(params *CreateUploadParams, authInfo runtime.Clien for _, opt := range opts { opt(op) } - result, err := a.transport.Submit(op) if err != nil { return nil, err } + + // only one success response has to be checked success, ok := result.(*CreateUploadCreated) if ok { return success, nil } - // unexpected success response + + // unexpected success response. + // + // a default response is provided: fill this and return an error unexpectedSuccess := result.(*CreateUploadDefault) + return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code()) } @@ -131,7 +136,7 @@ GetUploadByID gets upload Returns an upload for a given identifier. Requires activity:write scope. */ func (a *Client) GetUploadByID(params *GetUploadByIDParams, authInfo runtime.ClientAuthInfoWriter, opts ...ClientOption) (*GetUploadByIDOK, error) { - // TODO: Validate the params before sending + // NOTE: parameters are not validated before sending if params == nil { params = NewGetUploadByIDParams() } @@ -151,17 +156,22 @@ func (a *Client) GetUploadByID(params *GetUploadByIDParams, authInfo runtime.Cli for _, opt := range opts { opt(op) } - result, err := a.transport.Submit(op) if err != nil { return nil, err } + + // only one success response has to be checked success, ok := result.(*GetUploadByIDOK) if ok { return success, nil } - // unexpected success response + + // unexpected success response. + // + // a default response is provided: fill this and return an error unexpectedSuccess := result.(*GetUploadByIDDefault) + return nil, runtime.NewAPIError("unexpected success response: content available as default response in error", unexpectedSuccess, unexpectedSuccess.Code()) } diff --git a/internal/gen/strava-api-go/models/activity_stats.go b/internal/gen/strava-api-go/models/activity_stats.go index 66953e8..9cf5065 100644 --- a/internal/gen/strava-api-go/models/activity_stats.go +++ b/internal/gen/strava-api-go/models/activity_stats.go @@ -7,6 +7,7 @@ package models import ( "context" + stderrors "errors" "github.com/go-openapi/errors" "github.com/go-openapi/strfmt" @@ -17,7 +18,6 @@ import ( // // swagger:model activityStats type ActivityStats struct { - // all ride totals AllRideTotals *ActivityTotal `json:"all_ride_totals,omitempty"` @@ -105,11 +105,15 @@ func (m *ActivityStats) validateAllRideTotals(formats strfmt.Registry) error { if m.AllRideTotals != nil { if err := m.AllRideTotals.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("all_ride_totals") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("all_ride_totals") } + return err } } @@ -124,11 +128,15 @@ func (m *ActivityStats) validateAllRunTotals(formats strfmt.Registry) error { if m.AllRunTotals != nil { if err := m.AllRunTotals.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("all_run_totals") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("all_run_totals") } + return err } } @@ -143,11 +151,15 @@ func (m *ActivityStats) validateAllSwimTotals(formats strfmt.Registry) error { if m.AllSwimTotals != nil { if err := m.AllSwimTotals.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("all_swim_totals") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("all_swim_totals") } + return err } } @@ -162,11 +174,15 @@ func (m *ActivityStats) validateRecentRideTotals(formats strfmt.Registry) error if m.RecentRideTotals != nil { if err := m.RecentRideTotals.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("recent_ride_totals") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("recent_ride_totals") } + return err } } @@ -181,11 +197,15 @@ func (m *ActivityStats) validateRecentRunTotals(formats strfmt.Registry) error { if m.RecentRunTotals != nil { if err := m.RecentRunTotals.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("recent_run_totals") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("recent_run_totals") } + return err } } @@ -200,11 +220,15 @@ func (m *ActivityStats) validateRecentSwimTotals(formats strfmt.Registry) error if m.RecentSwimTotals != nil { if err := m.RecentSwimTotals.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("recent_swim_totals") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("recent_swim_totals") } + return err } } @@ -219,11 +243,15 @@ func (m *ActivityStats) validateYtdRideTotals(formats strfmt.Registry) error { if m.YtdRideTotals != nil { if err := m.YtdRideTotals.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("ytd_ride_totals") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("ytd_ride_totals") } + return err } } @@ -238,11 +266,15 @@ func (m *ActivityStats) validateYtdRunTotals(formats strfmt.Registry) error { if m.YtdRunTotals != nil { if err := m.YtdRunTotals.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("ytd_run_totals") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("ytd_run_totals") } + return err } } @@ -257,11 +289,15 @@ func (m *ActivityStats) validateYtdSwimTotals(formats strfmt.Registry) error { if m.YtdSwimTotals != nil { if err := m.YtdSwimTotals.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("ytd_swim_totals") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("ytd_swim_totals") } + return err } } @@ -316,7 +352,6 @@ func (m *ActivityStats) ContextValidate(ctx context.Context, formats strfmt.Regi } func (m *ActivityStats) contextValidateAllRideTotals(ctx context.Context, formats strfmt.Registry) error { - if m.AllRideTotals != nil { if swag.IsZero(m.AllRideTotals) { // not required @@ -324,11 +359,15 @@ func (m *ActivityStats) contextValidateAllRideTotals(ctx context.Context, format } if err := m.AllRideTotals.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("all_ride_totals") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("all_ride_totals") } + return err } } @@ -337,7 +376,6 @@ func (m *ActivityStats) contextValidateAllRideTotals(ctx context.Context, format } func (m *ActivityStats) contextValidateAllRunTotals(ctx context.Context, formats strfmt.Registry) error { - if m.AllRunTotals != nil { if swag.IsZero(m.AllRunTotals) { // not required @@ -345,11 +383,15 @@ func (m *ActivityStats) contextValidateAllRunTotals(ctx context.Context, formats } if err := m.AllRunTotals.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("all_run_totals") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("all_run_totals") } + return err } } @@ -358,7 +400,6 @@ func (m *ActivityStats) contextValidateAllRunTotals(ctx context.Context, formats } func (m *ActivityStats) contextValidateAllSwimTotals(ctx context.Context, formats strfmt.Registry) error { - if m.AllSwimTotals != nil { if swag.IsZero(m.AllSwimTotals) { // not required @@ -366,11 +407,15 @@ func (m *ActivityStats) contextValidateAllSwimTotals(ctx context.Context, format } if err := m.AllSwimTotals.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("all_swim_totals") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("all_swim_totals") } + return err } } @@ -379,7 +424,6 @@ func (m *ActivityStats) contextValidateAllSwimTotals(ctx context.Context, format } func (m *ActivityStats) contextValidateRecentRideTotals(ctx context.Context, formats strfmt.Registry) error { - if m.RecentRideTotals != nil { if swag.IsZero(m.RecentRideTotals) { // not required @@ -387,11 +431,15 @@ func (m *ActivityStats) contextValidateRecentRideTotals(ctx context.Context, for } if err := m.RecentRideTotals.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("recent_ride_totals") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("recent_ride_totals") } + return err } } @@ -400,7 +448,6 @@ func (m *ActivityStats) contextValidateRecentRideTotals(ctx context.Context, for } func (m *ActivityStats) contextValidateRecentRunTotals(ctx context.Context, formats strfmt.Registry) error { - if m.RecentRunTotals != nil { if swag.IsZero(m.RecentRunTotals) { // not required @@ -408,11 +455,15 @@ func (m *ActivityStats) contextValidateRecentRunTotals(ctx context.Context, form } if err := m.RecentRunTotals.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("recent_run_totals") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("recent_run_totals") } + return err } } @@ -421,7 +472,6 @@ func (m *ActivityStats) contextValidateRecentRunTotals(ctx context.Context, form } func (m *ActivityStats) contextValidateRecentSwimTotals(ctx context.Context, formats strfmt.Registry) error { - if m.RecentSwimTotals != nil { if swag.IsZero(m.RecentSwimTotals) { // not required @@ -429,11 +479,15 @@ func (m *ActivityStats) contextValidateRecentSwimTotals(ctx context.Context, for } if err := m.RecentSwimTotals.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("recent_swim_totals") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("recent_swim_totals") } + return err } } @@ -442,7 +496,6 @@ func (m *ActivityStats) contextValidateRecentSwimTotals(ctx context.Context, for } func (m *ActivityStats) contextValidateYtdRideTotals(ctx context.Context, formats strfmt.Registry) error { - if m.YtdRideTotals != nil { if swag.IsZero(m.YtdRideTotals) { // not required @@ -450,11 +503,15 @@ func (m *ActivityStats) contextValidateYtdRideTotals(ctx context.Context, format } if err := m.YtdRideTotals.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("ytd_ride_totals") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("ytd_ride_totals") } + return err } } @@ -463,7 +520,6 @@ func (m *ActivityStats) contextValidateYtdRideTotals(ctx context.Context, format } func (m *ActivityStats) contextValidateYtdRunTotals(ctx context.Context, formats strfmt.Registry) error { - if m.YtdRunTotals != nil { if swag.IsZero(m.YtdRunTotals) { // not required @@ -471,11 +527,15 @@ func (m *ActivityStats) contextValidateYtdRunTotals(ctx context.Context, formats } if err := m.YtdRunTotals.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("ytd_run_totals") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("ytd_run_totals") } + return err } } @@ -484,7 +544,6 @@ func (m *ActivityStats) contextValidateYtdRunTotals(ctx context.Context, formats } func (m *ActivityStats) contextValidateYtdSwimTotals(ctx context.Context, formats strfmt.Registry) error { - if m.YtdSwimTotals != nil { if swag.IsZero(m.YtdSwimTotals) { // not required @@ -492,11 +551,15 @@ func (m *ActivityStats) contextValidateYtdSwimTotals(ctx context.Context, format } if err := m.YtdSwimTotals.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("ytd_swim_totals") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("ytd_swim_totals") } + return err } } diff --git a/internal/gen/strava-api-go/models/activity_total.go b/internal/gen/strava-api-go/models/activity_total.go index 585e9ed..1b6980f 100644 --- a/internal/gen/strava-api-go/models/activity_total.go +++ b/internal/gen/strava-api-go/models/activity_total.go @@ -16,7 +16,6 @@ import ( // // swagger:model activityTotal type ActivityTotal struct { - // The total number of achievements of the considered activities. AchievementCount int64 `json:"achievement_count,omitempty"` diff --git a/internal/gen/strava-api-go/models/activity_type.go b/internal/gen/strava-api-go/models/activity_type.go index 34b72aa..b3e523b 100644 --- a/internal/gen/strava-api-go/models/activity_type.go +++ b/internal/gen/strava-api-go/models/activity_type.go @@ -143,7 +143,7 @@ const ( ) // for schema -var activityTypeEnum []interface{} +var activityTypeEnum []any func init() { var res []ActivityType diff --git a/internal/gen/strava-api-go/models/activity_zone.go b/internal/gen/strava-api-go/models/activity_zone.go index a729b9a..7aed2f6 100644 --- a/internal/gen/strava-api-go/models/activity_zone.go +++ b/internal/gen/strava-api-go/models/activity_zone.go @@ -8,6 +8,7 @@ package models import ( "context" "encoding/json" + stderrors "errors" "github.com/go-openapi/errors" "github.com/go-openapi/strfmt" @@ -19,7 +20,6 @@ import ( // // swagger:model activityZone type ActivityZone struct { - // custom zones CustomZones bool `json:"custom_zones,omitempty"` @@ -67,18 +67,22 @@ func (m *ActivityZone) validateDistributionBuckets(formats strfmt.Registry) erro } if err := m.DistributionBuckets.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("distribution_buckets") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("distribution_buckets") } + return err } return nil } -var activityZoneTypeTypePropEnum []interface{} +var activityZoneTypeTypePropEnum []any func init() { var res []string @@ -135,13 +139,16 @@ func (m *ActivityZone) ContextValidate(ctx context.Context, formats strfmt.Regis } func (m *ActivityZone) contextValidateDistributionBuckets(ctx context.Context, formats strfmt.Registry) error { - if err := m.DistributionBuckets.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("distribution_buckets") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("distribution_buckets") } + return err } diff --git a/internal/gen/strava-api-go/models/base_stream.go b/internal/gen/strava-api-go/models/base_stream.go index 9741f9d..3974acc 100644 --- a/internal/gen/strava-api-go/models/base_stream.go +++ b/internal/gen/strava-api-go/models/base_stream.go @@ -19,7 +19,6 @@ import ( // // swagger:model baseStream type BaseStream struct { - // The number of data points in this stream OriginalSize int64 `json:"original_size,omitempty"` @@ -50,7 +49,7 @@ func (m *BaseStream) Validate(formats strfmt.Registry) error { return nil } -var baseStreamTypeResolutionPropEnum []interface{} +var baseStreamTypeResolutionPropEnum []any func init() { var res []string @@ -95,7 +94,7 @@ func (m *BaseStream) validateResolution(formats strfmt.Registry) error { return nil } -var baseStreamTypeSeriesTypePropEnum []interface{} +var baseStreamTypeSeriesTypePropEnum []any func init() { var res []string diff --git a/internal/gen/strava-api-go/models/club_activity.go b/internal/gen/strava-api-go/models/club_activity.go index 3daab20..02bae7e 100644 --- a/internal/gen/strava-api-go/models/club_activity.go +++ b/internal/gen/strava-api-go/models/club_activity.go @@ -7,6 +7,7 @@ package models import ( "context" + stderrors "errors" "github.com/go-openapi/errors" "github.com/go-openapi/strfmt" @@ -17,7 +18,6 @@ import ( // // swagger:model clubActivity type ClubActivity struct { - // athlete Athlete *MetaAthlete `json:"athlete,omitempty"` @@ -75,11 +75,15 @@ func (m *ClubActivity) validateAthlete(formats strfmt.Registry) error { if m.Athlete != nil { if err := m.Athlete.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("athlete") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("athlete") } + return err } } @@ -93,11 +97,15 @@ func (m *ClubActivity) validateSportType(formats strfmt.Registry) error { } if err := m.SportType.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("sport_type") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("sport_type") } + return err } @@ -110,11 +118,15 @@ func (m *ClubActivity) validateType(formats strfmt.Registry) error { } if err := m.Type.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("type") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("type") } + return err } @@ -144,7 +156,6 @@ func (m *ClubActivity) ContextValidate(ctx context.Context, formats strfmt.Regis } func (m *ClubActivity) contextValidateAthlete(ctx context.Context, formats strfmt.Registry) error { - if m.Athlete != nil { if swag.IsZero(m.Athlete) { // not required @@ -152,11 +163,15 @@ func (m *ClubActivity) contextValidateAthlete(ctx context.Context, formats strfm } if err := m.Athlete.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("athlete") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("athlete") } + return err } } @@ -165,17 +180,20 @@ func (m *ClubActivity) contextValidateAthlete(ctx context.Context, formats strfm } func (m *ClubActivity) contextValidateSportType(ctx context.Context, formats strfmt.Registry) error { - if swag.IsZero(m.SportType) { // not required return nil } if err := m.SportType.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("sport_type") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("sport_type") } + return err } @@ -183,17 +201,20 @@ func (m *ClubActivity) contextValidateSportType(ctx context.Context, formats str } func (m *ClubActivity) contextValidateType(ctx context.Context, formats strfmt.Registry) error { - if swag.IsZero(m.Type) { // not required return nil } if err := m.Type.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("type") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("type") } + return err } diff --git a/internal/gen/strava-api-go/models/club_athlete.go b/internal/gen/strava-api-go/models/club_athlete.go index 286d0ba..0f9dc38 100644 --- a/internal/gen/strava-api-go/models/club_athlete.go +++ b/internal/gen/strava-api-go/models/club_athlete.go @@ -16,7 +16,6 @@ import ( // // swagger:model clubAthlete type ClubAthlete struct { - // Whether the athlete is a club admin. Admin bool `json:"admin,omitempty"` diff --git a/internal/gen/strava-api-go/models/comment.go b/internal/gen/strava-api-go/models/comment.go index 830ef69..7bcf469 100644 --- a/internal/gen/strava-api-go/models/comment.go +++ b/internal/gen/strava-api-go/models/comment.go @@ -7,6 +7,7 @@ package models import ( "context" + stderrors "errors" "github.com/go-openapi/errors" "github.com/go-openapi/strfmt" @@ -18,7 +19,6 @@ import ( // // swagger:model comment type Comment struct { - // The identifier of the activity this comment is related to ActivityID int64 `json:"activity_id,omitempty"` @@ -61,11 +61,15 @@ func (m *Comment) validateAthlete(formats strfmt.Registry) error { if m.Athlete != nil { if err := m.Athlete.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("athlete") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("athlete") } + return err } } @@ -100,7 +104,6 @@ func (m *Comment) ContextValidate(ctx context.Context, formats strfmt.Registry) } func (m *Comment) contextValidateAthlete(ctx context.Context, formats strfmt.Registry) error { - if m.Athlete != nil { if swag.IsZero(m.Athlete) { // not required @@ -108,11 +111,15 @@ func (m *Comment) contextValidateAthlete(ctx context.Context, formats strfmt.Reg } if err := m.Athlete.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("athlete") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("athlete") } + return err } } diff --git a/internal/gen/strava-api-go/models/comment_athlete.go b/internal/gen/strava-api-go/models/comment_athlete.go index 1670304..6d0eeee 100644 --- a/internal/gen/strava-api-go/models/comment_athlete.go +++ b/internal/gen/strava-api-go/models/comment_athlete.go @@ -233,7 +233,6 @@ func (m *CommentAthlete) Validate(formats strfmt.Registry) error { } func (m *CommentAthlete) validateCreatedAt(formats strfmt.Registry) error { - if swag.IsZero(m.CreatedAt) { // not required return nil } @@ -245,7 +244,7 @@ func (m *CommentAthlete) validateCreatedAt(formats strfmt.Registry) error { return nil } -var commentAthleteTypeSexPropEnum []interface{} +var commentAthleteTypeSexPropEnum []any func init() { var res []string @@ -266,7 +265,6 @@ func (m *CommentAthlete) validateSexEnum(path, location string, value string) er } func (m *CommentAthlete) validateSex(formats strfmt.Registry) error { - if swag.IsZero(m.Sex) { // not required return nil } @@ -280,7 +278,6 @@ func (m *CommentAthlete) validateSex(formats strfmt.Registry) error { } func (m *CommentAthlete) validateUpdatedAt(formats strfmt.Registry) error { - if swag.IsZero(m.UpdatedAt) { // not required return nil } diff --git a/internal/gen/strava-api-go/models/detailed_activity.go b/internal/gen/strava-api-go/models/detailed_activity.go index a9b2a78..f2bb6de 100644 --- a/internal/gen/strava-api-go/models/detailed_activity.go +++ b/internal/gen/strava-api-go/models/detailed_activity.go @@ -7,6 +7,7 @@ package models import ( "context" + stderrors "errors" "strconv" "github.com/go-openapi/errors" @@ -224,7 +225,6 @@ func (m *DetailedActivity) Validate(formats strfmt.Registry) error { } func (m *DetailedActivity) validateBestEfforts(formats strfmt.Registry) error { - if swag.IsZero(m.BestEfforts) { // not required return nil } @@ -236,11 +236,15 @@ func (m *DetailedActivity) validateBestEfforts(formats strfmt.Registry) error { if m.BestEfforts[i] != nil { if err := m.BestEfforts[i].Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("best_efforts" + "." + strconv.Itoa(i)) - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("best_efforts" + "." + strconv.Itoa(i)) } + return err } } @@ -251,18 +255,21 @@ func (m *DetailedActivity) validateBestEfforts(formats strfmt.Registry) error { } func (m *DetailedActivity) validateGear(formats strfmt.Registry) error { - if swag.IsZero(m.Gear) { // not required return nil } if m.Gear != nil { if err := m.Gear.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("gear") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("gear") } + return err } } @@ -271,7 +278,6 @@ func (m *DetailedActivity) validateGear(formats strfmt.Registry) error { } func (m *DetailedActivity) validateLaps(formats strfmt.Registry) error { - if swag.IsZero(m.Laps) { // not required return nil } @@ -283,11 +289,15 @@ func (m *DetailedActivity) validateLaps(formats strfmt.Registry) error { if m.Laps[i] != nil { if err := m.Laps[i].Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("laps" + "." + strconv.Itoa(i)) - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("laps" + "." + strconv.Itoa(i)) } + return err } } @@ -298,18 +308,21 @@ func (m *DetailedActivity) validateLaps(formats strfmt.Registry) error { } func (m *DetailedActivity) validatePhotos(formats strfmt.Registry) error { - if swag.IsZero(m.Photos) { // not required return nil } if m.Photos != nil { if err := m.Photos.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("photos") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("photos") } + return err } } @@ -318,7 +331,6 @@ func (m *DetailedActivity) validatePhotos(formats strfmt.Registry) error { } func (m *DetailedActivity) validateSegmentEfforts(formats strfmt.Registry) error { - if swag.IsZero(m.SegmentEfforts) { // not required return nil } @@ -330,11 +342,15 @@ func (m *DetailedActivity) validateSegmentEfforts(formats strfmt.Registry) error if m.SegmentEfforts[i] != nil { if err := m.SegmentEfforts[i].Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("segment_efforts" + "." + strconv.Itoa(i)) - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("segment_efforts" + "." + strconv.Itoa(i)) } + return err } } @@ -345,7 +361,6 @@ func (m *DetailedActivity) validateSegmentEfforts(formats strfmt.Registry) error } func (m *DetailedActivity) validateSplitsMetric(formats strfmt.Registry) error { - if swag.IsZero(m.SplitsMetric) { // not required return nil } @@ -357,11 +372,15 @@ func (m *DetailedActivity) validateSplitsMetric(formats strfmt.Registry) error { if m.SplitsMetric[i] != nil { if err := m.SplitsMetric[i].Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("splits_metric" + "." + strconv.Itoa(i)) - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("splits_metric" + "." + strconv.Itoa(i)) } + return err } } @@ -372,7 +391,6 @@ func (m *DetailedActivity) validateSplitsMetric(formats strfmt.Registry) error { } func (m *DetailedActivity) validateSplitsStandard(formats strfmt.Registry) error { - if swag.IsZero(m.SplitsStandard) { // not required return nil } @@ -384,11 +402,15 @@ func (m *DetailedActivity) validateSplitsStandard(formats strfmt.Registry) error if m.SplitsStandard[i] != nil { if err := m.SplitsStandard[i].Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("splits_standard" + "." + strconv.Itoa(i)) - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("splits_standard" + "." + strconv.Itoa(i)) } + return err } } @@ -442,9 +464,7 @@ func (m *DetailedActivity) ContextValidate(ctx context.Context, formats strfmt.R } func (m *DetailedActivity) contextValidateBestEfforts(ctx context.Context, formats strfmt.Registry) error { - for i := 0; i < len(m.BestEfforts); i++ { - if m.BestEfforts[i] != nil { if swag.IsZero(m.BestEfforts[i]) { // not required @@ -452,22 +472,24 @@ func (m *DetailedActivity) contextValidateBestEfforts(ctx context.Context, forma } if err := m.BestEfforts[i].ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("best_efforts" + "." + strconv.Itoa(i)) - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("best_efforts" + "." + strconv.Itoa(i)) } + return err } } - } return nil } func (m *DetailedActivity) contextValidateGear(ctx context.Context, formats strfmt.Registry) error { - if m.Gear != nil { if swag.IsZero(m.Gear) { // not required @@ -475,11 +497,15 @@ func (m *DetailedActivity) contextValidateGear(ctx context.Context, formats strf } if err := m.Gear.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("gear") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("gear") } + return err } } @@ -488,9 +514,7 @@ func (m *DetailedActivity) contextValidateGear(ctx context.Context, formats strf } func (m *DetailedActivity) contextValidateLaps(ctx context.Context, formats strfmt.Registry) error { - for i := 0; i < len(m.Laps); i++ { - if m.Laps[i] != nil { if swag.IsZero(m.Laps[i]) { // not required @@ -498,22 +522,24 @@ func (m *DetailedActivity) contextValidateLaps(ctx context.Context, formats strf } if err := m.Laps[i].ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("laps" + "." + strconv.Itoa(i)) - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("laps" + "." + strconv.Itoa(i)) } + return err } } - } return nil } func (m *DetailedActivity) contextValidatePhotos(ctx context.Context, formats strfmt.Registry) error { - if m.Photos != nil { if swag.IsZero(m.Photos) { // not required @@ -521,11 +547,15 @@ func (m *DetailedActivity) contextValidatePhotos(ctx context.Context, formats st } if err := m.Photos.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("photos") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("photos") } + return err } } @@ -534,9 +564,7 @@ func (m *DetailedActivity) contextValidatePhotos(ctx context.Context, formats st } func (m *DetailedActivity) contextValidateSegmentEfforts(ctx context.Context, formats strfmt.Registry) error { - for i := 0; i < len(m.SegmentEfforts); i++ { - if m.SegmentEfforts[i] != nil { if swag.IsZero(m.SegmentEfforts[i]) { // not required @@ -544,24 +572,25 @@ func (m *DetailedActivity) contextValidateSegmentEfforts(ctx context.Context, fo } if err := m.SegmentEfforts[i].ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("segment_efforts" + "." + strconv.Itoa(i)) - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("segment_efforts" + "." + strconv.Itoa(i)) } + return err } } - } return nil } func (m *DetailedActivity) contextValidateSplitsMetric(ctx context.Context, formats strfmt.Registry) error { - for i := 0; i < len(m.SplitsMetric); i++ { - if m.SplitsMetric[i] != nil { if swag.IsZero(m.SplitsMetric[i]) { // not required @@ -569,24 +598,25 @@ func (m *DetailedActivity) contextValidateSplitsMetric(ctx context.Context, form } if err := m.SplitsMetric[i].ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("splits_metric" + "." + strconv.Itoa(i)) - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("splits_metric" + "." + strconv.Itoa(i)) } + return err } } - } return nil } func (m *DetailedActivity) contextValidateSplitsStandard(ctx context.Context, formats strfmt.Registry) error { - for i := 0; i < len(m.SplitsStandard); i++ { - if m.SplitsStandard[i] != nil { if swag.IsZero(m.SplitsStandard[i]) { // not required @@ -594,15 +624,18 @@ func (m *DetailedActivity) contextValidateSplitsStandard(ctx context.Context, fo } if err := m.SplitsStandard[i].ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("splits_standard" + "." + strconv.Itoa(i)) - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("splits_standard" + "." + strconv.Itoa(i)) } + return err } } - } return nil @@ -654,6 +687,9 @@ type DetailedActivityAllOf0 struct { // Whether this activity is a commute Commute bool `json:"commute,omitempty"` + // The name of the device used to record the activity + DeviceName string `json:"device_name,omitempty"` + // Whether the watts are from a power meter, false if estimated DeviceWatts bool `json:"device_watts,omitempty"` @@ -784,6 +820,8 @@ func (m *DetailedActivityAllOf0) UnmarshalJSON(raw []byte) error { Commute bool `json:"commute,omitempty"` + DeviceName string `json:"device_name,omitempty"` + DeviceWatts bool `json:"device_watts,omitempty"` Distance float32 `json:"distance,omitempty"` @@ -870,6 +908,8 @@ func (m *DetailedActivityAllOf0) UnmarshalJSON(raw []byte) error { m.Commute = dataAO1.Commute + m.DeviceName = dataAO1.DeviceName + m.DeviceWatts = dataAO1.DeviceWatts m.Distance = dataAO1.Distance @@ -965,6 +1005,8 @@ func (m DetailedActivityAllOf0) MarshalJSON() ([]byte, error) { Commute bool `json:"commute,omitempty"` + DeviceName string `json:"device_name,omitempty"` + DeviceWatts bool `json:"device_watts,omitempty"` Distance float32 `json:"distance,omitempty"` @@ -1048,6 +1090,8 @@ func (m DetailedActivityAllOf0) MarshalJSON() ([]byte, error) { dataAO1.Commute = m.Commute + dataAO1.DeviceName = m.DeviceName + dataAO1.DeviceWatts = m.DeviceWatts dataAO1.Distance = m.Distance @@ -1176,18 +1220,21 @@ func (m *DetailedActivityAllOf0) Validate(formats strfmt.Registry) error { } func (m *DetailedActivityAllOf0) validateAthlete(formats strfmt.Registry) error { - if swag.IsZero(m.Athlete) { // not required return nil } if m.Athlete != nil { if err := m.Athlete.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("athlete") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("athlete") } + return err } } @@ -1196,7 +1243,6 @@ func (m *DetailedActivityAllOf0) validateAthlete(formats strfmt.Registry) error } func (m *DetailedActivityAllOf0) validateAthleteCount(formats strfmt.Registry) error { - if swag.IsZero(m.AthleteCount) { // not required return nil } @@ -1209,17 +1255,20 @@ func (m *DetailedActivityAllOf0) validateAthleteCount(formats strfmt.Registry) e } func (m *DetailedActivityAllOf0) validateEndLatlng(formats strfmt.Registry) error { - if swag.IsZero(m.EndLatlng) { // not required return nil } if err := m.EndLatlng.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("end_latlng") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("end_latlng") } + return err } @@ -1227,18 +1276,21 @@ func (m *DetailedActivityAllOf0) validateEndLatlng(formats strfmt.Registry) erro } func (m *DetailedActivityAllOf0) validateMap(formats strfmt.Registry) error { - if swag.IsZero(m.Map) { // not required return nil } if m.Map != nil { if err := m.Map.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("map") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("map") } + return err } } @@ -1247,17 +1299,20 @@ func (m *DetailedActivityAllOf0) validateMap(formats strfmt.Registry) error { } func (m *DetailedActivityAllOf0) validateSportType(formats strfmt.Registry) error { - if swag.IsZero(m.SportType) { // not required return nil } if err := m.SportType.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("sport_type") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("sport_type") } + return err } @@ -1265,7 +1320,6 @@ func (m *DetailedActivityAllOf0) validateSportType(formats strfmt.Registry) erro } func (m *DetailedActivityAllOf0) validateStartDate(formats strfmt.Registry) error { - if swag.IsZero(m.StartDate) { // not required return nil } @@ -1278,7 +1332,6 @@ func (m *DetailedActivityAllOf0) validateStartDate(formats strfmt.Registry) erro } func (m *DetailedActivityAllOf0) validateStartDateLocal(formats strfmt.Registry) error { - if swag.IsZero(m.StartDateLocal) { // not required return nil } @@ -1291,17 +1344,20 @@ func (m *DetailedActivityAllOf0) validateStartDateLocal(formats strfmt.Registry) } func (m *DetailedActivityAllOf0) validateStartLatlng(formats strfmt.Registry) error { - if swag.IsZero(m.StartLatlng) { // not required return nil } if err := m.StartLatlng.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("start_latlng") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("start_latlng") } + return err } @@ -1309,17 +1365,20 @@ func (m *DetailedActivityAllOf0) validateStartLatlng(formats strfmt.Registry) er } func (m *DetailedActivityAllOf0) validateType(formats strfmt.Registry) error { - if swag.IsZero(m.Type) { // not required return nil } if err := m.Type.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("type") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("type") } + return err } @@ -1366,7 +1425,6 @@ func (m *DetailedActivityAllOf0) ContextValidate(ctx context.Context, formats st } func (m *DetailedActivityAllOf0) contextValidateAthlete(ctx context.Context, formats strfmt.Registry) error { - if m.Athlete != nil { if swag.IsZero(m.Athlete) { // not required @@ -1374,11 +1432,15 @@ func (m *DetailedActivityAllOf0) contextValidateAthlete(ctx context.Context, for } if err := m.Athlete.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("athlete") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("athlete") } + return err } } @@ -1387,13 +1449,16 @@ func (m *DetailedActivityAllOf0) contextValidateAthlete(ctx context.Context, for } func (m *DetailedActivityAllOf0) contextValidateEndLatlng(ctx context.Context, formats strfmt.Registry) error { - if err := m.EndLatlng.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("end_latlng") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("end_latlng") } + return err } @@ -1401,7 +1466,6 @@ func (m *DetailedActivityAllOf0) contextValidateEndLatlng(ctx context.Context, f } func (m *DetailedActivityAllOf0) contextValidateMap(ctx context.Context, formats strfmt.Registry) error { - if m.Map != nil { if swag.IsZero(m.Map) { // not required @@ -1409,11 +1473,15 @@ func (m *DetailedActivityAllOf0) contextValidateMap(ctx context.Context, formats } if err := m.Map.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("map") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("map") } + return err } } @@ -1422,17 +1490,20 @@ func (m *DetailedActivityAllOf0) contextValidateMap(ctx context.Context, formats } func (m *DetailedActivityAllOf0) contextValidateSportType(ctx context.Context, formats strfmt.Registry) error { - if swag.IsZero(m.SportType) { // not required return nil } if err := m.SportType.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("sport_type") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("sport_type") } + return err } @@ -1440,13 +1511,16 @@ func (m *DetailedActivityAllOf0) contextValidateSportType(ctx context.Context, f } func (m *DetailedActivityAllOf0) contextValidateStartLatlng(ctx context.Context, formats strfmt.Registry) error { - if err := m.StartLatlng.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("start_latlng") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("start_latlng") } + return err } @@ -1454,17 +1528,20 @@ func (m *DetailedActivityAllOf0) contextValidateStartLatlng(ctx context.Context, } func (m *DetailedActivityAllOf0) contextValidateType(ctx context.Context, formats strfmt.Registry) error { - if swag.IsZero(m.Type) { // not required return nil } if err := m.Type.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("type") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("type") } + return err } @@ -1493,7 +1570,6 @@ func (m *DetailedActivityAllOf0) UnmarshalBinary(b []byte) error { // // swagger:model DetailedActivityLapsItems0 type DetailedActivityLapsItems0 struct { - // activity Activity *MetaActivity `json:"activity,omitempty"` @@ -1584,11 +1660,15 @@ func (m *DetailedActivityLapsItems0) validateActivity(formats strfmt.Registry) e if m.Activity != nil { if err := m.Activity.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("activity") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("activity") } + return err } } @@ -1603,11 +1683,15 @@ func (m *DetailedActivityLapsItems0) validateAthlete(formats strfmt.Registry) er if m.Athlete != nil { if err := m.Athlete.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("athlete") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("athlete") } + return err } } @@ -1658,7 +1742,6 @@ func (m *DetailedActivityLapsItems0) ContextValidate(ctx context.Context, format } func (m *DetailedActivityLapsItems0) contextValidateActivity(ctx context.Context, formats strfmt.Registry) error { - if m.Activity != nil { if swag.IsZero(m.Activity) { // not required @@ -1666,11 +1749,15 @@ func (m *DetailedActivityLapsItems0) contextValidateActivity(ctx context.Context } if err := m.Activity.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("activity") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("activity") } + return err } } @@ -1679,7 +1766,6 @@ func (m *DetailedActivityLapsItems0) contextValidateActivity(ctx context.Context } func (m *DetailedActivityLapsItems0) contextValidateAthlete(ctx context.Context, formats strfmt.Registry) error { - if m.Athlete != nil { if swag.IsZero(m.Athlete) { // not required @@ -1687,11 +1773,15 @@ func (m *DetailedActivityLapsItems0) contextValidateAthlete(ctx context.Context, } if err := m.Athlete.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("athlete") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("athlete") } + return err } } diff --git a/internal/gen/strava-api-go/models/detailed_activity_all_of1_best_efforts_items.go b/internal/gen/strava-api-go/models/detailed_activity_all_of1_best_efforts_items.go index 342b4df..7013832 100644 --- a/internal/gen/strava-api-go/models/detailed_activity_all_of1_best_efforts_items.go +++ b/internal/gen/strava-api-go/models/detailed_activity_all_of1_best_efforts_items.go @@ -7,6 +7,7 @@ package models import ( "context" + stderrors "errors" "github.com/go-openapi/errors" "github.com/go-openapi/strfmt" @@ -263,18 +264,21 @@ func (m *DetailedActivityAllOf1BestEffortsItems) Validate(formats strfmt.Registr } func (m *DetailedActivityAllOf1BestEffortsItems) validateActivity(formats strfmt.Registry) error { - if swag.IsZero(m.Activity) { // not required return nil } if m.Activity != nil { if err := m.Activity.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("activity") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("activity") } + return err } } @@ -283,18 +287,21 @@ func (m *DetailedActivityAllOf1BestEffortsItems) validateActivity(formats strfmt } func (m *DetailedActivityAllOf1BestEffortsItems) validateAthlete(formats strfmt.Registry) error { - if swag.IsZero(m.Athlete) { // not required return nil } if m.Athlete != nil { if err := m.Athlete.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("athlete") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("athlete") } + return err } } @@ -303,7 +310,6 @@ func (m *DetailedActivityAllOf1BestEffortsItems) validateAthlete(formats strfmt. } func (m *DetailedActivityAllOf1BestEffortsItems) validateKomRank(formats strfmt.Registry) error { - if swag.IsZero(m.KomRank) { // not required return nil } @@ -320,7 +326,6 @@ func (m *DetailedActivityAllOf1BestEffortsItems) validateKomRank(formats strfmt. } func (m *DetailedActivityAllOf1BestEffortsItems) validatePrRank(formats strfmt.Registry) error { - if swag.IsZero(m.PrRank) { // not required return nil } @@ -337,18 +342,21 @@ func (m *DetailedActivityAllOf1BestEffortsItems) validatePrRank(formats strfmt.R } func (m *DetailedActivityAllOf1BestEffortsItems) validateSegment(formats strfmt.Registry) error { - if swag.IsZero(m.Segment) { // not required return nil } if m.Segment != nil { if err := m.Segment.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("segment") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("segment") } + return err } } @@ -384,7 +392,6 @@ func (m *DetailedActivityAllOf1BestEffortsItems) ContextValidate(ctx context.Con } func (m *DetailedActivityAllOf1BestEffortsItems) contextValidateActivity(ctx context.Context, formats strfmt.Registry) error { - if m.Activity != nil { if swag.IsZero(m.Activity) { // not required @@ -392,11 +399,15 @@ func (m *DetailedActivityAllOf1BestEffortsItems) contextValidateActivity(ctx con } if err := m.Activity.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("activity") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("activity") } + return err } } @@ -405,7 +416,6 @@ func (m *DetailedActivityAllOf1BestEffortsItems) contextValidateActivity(ctx con } func (m *DetailedActivityAllOf1BestEffortsItems) contextValidateAthlete(ctx context.Context, formats strfmt.Registry) error { - if m.Athlete != nil { if swag.IsZero(m.Athlete) { // not required @@ -413,11 +423,15 @@ func (m *DetailedActivityAllOf1BestEffortsItems) contextValidateAthlete(ctx cont } if err := m.Athlete.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("athlete") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("athlete") } + return err } } @@ -426,7 +440,6 @@ func (m *DetailedActivityAllOf1BestEffortsItems) contextValidateAthlete(ctx cont } func (m *DetailedActivityAllOf1BestEffortsItems) contextValidateSegment(ctx context.Context, formats strfmt.Registry) error { - if m.Segment != nil { if swag.IsZero(m.Segment) { // not required @@ -434,11 +447,15 @@ func (m *DetailedActivityAllOf1BestEffortsItems) contextValidateSegment(ctx cont } if err := m.Segment.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("segment") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("segment") } + return err } } diff --git a/internal/gen/strava-api-go/models/detailed_athlete.go b/internal/gen/strava-api-go/models/detailed_athlete.go index d27866c..f9f870a 100644 --- a/internal/gen/strava-api-go/models/detailed_athlete.go +++ b/internal/gen/strava-api-go/models/detailed_athlete.go @@ -8,6 +8,7 @@ package models import ( "context" "encoding/json" + stderrors "errors" "strconv" "github.com/go-openapi/errors" @@ -181,7 +182,6 @@ func (m *DetailedAthlete) Validate(formats strfmt.Registry) error { } func (m *DetailedAthlete) validateBikes(formats strfmt.Registry) error { - if swag.IsZero(m.Bikes) { // not required return nil } @@ -193,11 +193,15 @@ func (m *DetailedAthlete) validateBikes(formats strfmt.Registry) error { if m.Bikes[i] != nil { if err := m.Bikes[i].Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("bikes" + "." + strconv.Itoa(i)) - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("bikes" + "." + strconv.Itoa(i)) } + return err } } @@ -208,7 +212,6 @@ func (m *DetailedAthlete) validateBikes(formats strfmt.Registry) error { } func (m *DetailedAthlete) validateClubs(formats strfmt.Registry) error { - if swag.IsZero(m.Clubs) { // not required return nil } @@ -220,11 +223,15 @@ func (m *DetailedAthlete) validateClubs(formats strfmt.Registry) error { if m.Clubs[i] != nil { if err := m.Clubs[i].Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("clubs" + "." + strconv.Itoa(i)) - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("clubs" + "." + strconv.Itoa(i)) } + return err } } @@ -234,7 +241,7 @@ func (m *DetailedAthlete) validateClubs(formats strfmt.Registry) error { return nil } -var detailedAthleteTypeMeasurementPreferencePropEnum []interface{} +var detailedAthleteTypeMeasurementPreferencePropEnum []any func init() { var res []string @@ -255,7 +262,6 @@ func (m *DetailedAthlete) validateMeasurementPreferenceEnum(path, location strin } func (m *DetailedAthlete) validateMeasurementPreference(formats strfmt.Registry) error { - if swag.IsZero(m.MeasurementPreference) { // not required return nil } @@ -269,7 +275,6 @@ func (m *DetailedAthlete) validateMeasurementPreference(formats strfmt.Registry) } func (m *DetailedAthlete) validateShoes(formats strfmt.Registry) error { - if swag.IsZero(m.Shoes) { // not required return nil } @@ -281,11 +286,15 @@ func (m *DetailedAthlete) validateShoes(formats strfmt.Registry) error { if m.Shoes[i] != nil { if err := m.Shoes[i].Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("shoes" + "." + strconv.Itoa(i)) - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("shoes" + "." + strconv.Itoa(i)) } + return err } } @@ -323,9 +332,7 @@ func (m *DetailedAthlete) ContextValidate(ctx context.Context, formats strfmt.Re } func (m *DetailedAthlete) contextValidateBikes(ctx context.Context, formats strfmt.Registry) error { - for i := 0; i < len(m.Bikes); i++ { - if m.Bikes[i] != nil { if swag.IsZero(m.Bikes[i]) { // not required @@ -333,24 +340,25 @@ func (m *DetailedAthlete) contextValidateBikes(ctx context.Context, formats strf } if err := m.Bikes[i].ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("bikes" + "." + strconv.Itoa(i)) - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("bikes" + "." + strconv.Itoa(i)) } + return err } } - } return nil } func (m *DetailedAthlete) contextValidateClubs(ctx context.Context, formats strfmt.Registry) error { - for i := 0; i < len(m.Clubs); i++ { - if m.Clubs[i] != nil { if swag.IsZero(m.Clubs[i]) { // not required @@ -358,24 +366,25 @@ func (m *DetailedAthlete) contextValidateClubs(ctx context.Context, formats strf } if err := m.Clubs[i].ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("clubs" + "." + strconv.Itoa(i)) - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("clubs" + "." + strconv.Itoa(i)) } + return err } } - } return nil } func (m *DetailedAthlete) contextValidateShoes(ctx context.Context, formats strfmt.Registry) error { - for i := 0; i < len(m.Shoes); i++ { - if m.Shoes[i] != nil { if swag.IsZero(m.Shoes[i]) { // not required @@ -383,15 +392,18 @@ func (m *DetailedAthlete) contextValidateShoes(ctx context.Context, formats strf } if err := m.Shoes[i].ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("shoes" + "." + strconv.Itoa(i)) - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("shoes" + "." + strconv.Itoa(i)) } + return err } } - } return nil diff --git a/internal/gen/strava-api-go/models/detailed_club.go b/internal/gen/strava-api-go/models/detailed_club.go index abf29b1..24b6829 100644 --- a/internal/gen/strava-api-go/models/detailed_club.go +++ b/internal/gen/strava-api-go/models/detailed_club.go @@ -123,7 +123,7 @@ func (m *DetailedClub) Validate(formats strfmt.Registry) error { return nil } -var detailedClubTypeMembershipPropEnum []interface{} +var detailedClubTypeMembershipPropEnum []any func init() { var res []string @@ -144,7 +144,6 @@ func (m *DetailedClub) validateMembershipEnum(path, location string, value strin } func (m *DetailedClub) validateMembership(formats strfmt.Registry) error { - if swag.IsZero(m.Membership) { // not required return nil } diff --git a/internal/gen/strava-api-go/models/detailed_club_all_of0.go b/internal/gen/strava-api-go/models/detailed_club_all_of0.go index f6fa463..f113217 100644 --- a/internal/gen/strava-api-go/models/detailed_club_all_of0.go +++ b/internal/gen/strava-api-go/models/detailed_club_all_of0.go @@ -8,6 +8,7 @@ package models import ( "context" "encoding/json" + stderrors "errors" "strconv" "github.com/go-openapi/errors" @@ -228,28 +229,29 @@ func (m *DetailedClubAllOf0) Validate(formats strfmt.Registry) error { } func (m *DetailedClubAllOf0) validateActivityTypes(formats strfmt.Registry) error { - if swag.IsZero(m.ActivityTypes) { // not required return nil } for i := 0; i < len(m.ActivityTypes); i++ { - if err := m.ActivityTypes[i].Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("activity_types" + "." + strconv.Itoa(i)) - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("activity_types" + "." + strconv.Itoa(i)) } + return err } - } return nil } -var detailedClubAllOf0TypeSportTypePropEnum []interface{} +var detailedClubAllOf0TypeSportTypePropEnum []any func init() { var res []string @@ -270,7 +272,6 @@ func (m *DetailedClubAllOf0) validateSportTypeEnum(path, location string, value } func (m *DetailedClubAllOf0) validateSportType(formats strfmt.Registry) error { - if swag.IsZero(m.SportType) { // not required return nil } @@ -303,7 +304,6 @@ func (m *DetailedClubAllOf0) ContextValidate(ctx context.Context, formats strfmt } func (m *DetailedClubAllOf0) contextValidateActivityTypes(ctx context.Context, formats strfmt.Registry) error { - for i := 0; i < len(m.ActivityTypes); i++ { if swag.IsZero(m.ActivityTypes[i]) { // not required @@ -311,11 +311,15 @@ func (m *DetailedClubAllOf0) contextValidateActivityTypes(ctx context.Context, f } if err := m.ActivityTypes[i].ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("activity_types" + "." + strconv.Itoa(i)) - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("activity_types" + "." + strconv.Itoa(i)) } + return err } diff --git a/internal/gen/strava-api-go/models/detailed_segment.go b/internal/gen/strava-api-go/models/detailed_segment.go index 5979014..2f1d81d 100644 --- a/internal/gen/strava-api-go/models/detailed_segment.go +++ b/internal/gen/strava-api-go/models/detailed_segment.go @@ -7,6 +7,7 @@ package models import ( "context" + stderrors "errors" "github.com/go-openapi/errors" "github.com/go-openapi/strfmt" @@ -176,7 +177,6 @@ func (m *DetailedSegment) Validate(formats strfmt.Registry) error { } func (m *DetailedSegment) validateCreatedAt(formats strfmt.Registry) error { - if swag.IsZero(m.CreatedAt) { // not required return nil } @@ -189,18 +189,21 @@ func (m *DetailedSegment) validateCreatedAt(formats strfmt.Registry) error { } func (m *DetailedSegment) validateMap(formats strfmt.Registry) error { - if swag.IsZero(m.Map) { // not required return nil } if m.Map != nil { if err := m.Map.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("map") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("map") } + return err } } @@ -209,7 +212,6 @@ func (m *DetailedSegment) validateMap(formats strfmt.Registry) error { } func (m *DetailedSegment) validateUpdatedAt(formats strfmt.Registry) error { - if swag.IsZero(m.UpdatedAt) { // not required return nil } @@ -241,7 +243,6 @@ func (m *DetailedSegment) ContextValidate(ctx context.Context, formats strfmt.Re } func (m *DetailedSegment) contextValidateMap(ctx context.Context, formats strfmt.Registry) error { - if m.Map != nil { if swag.IsZero(m.Map) { // not required @@ -249,11 +250,15 @@ func (m *DetailedSegment) contextValidateMap(ctx context.Context, formats strfmt } if err := m.Map.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("map") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("map") } + return err } } diff --git a/internal/gen/strava-api-go/models/detailed_segment_all_of0.go b/internal/gen/strava-api-go/models/detailed_segment_all_of0.go index 6172edf..6b822ef 100644 --- a/internal/gen/strava-api-go/models/detailed_segment_all_of0.go +++ b/internal/gen/strava-api-go/models/detailed_segment_all_of0.go @@ -8,6 +8,7 @@ package models import ( "context" "encoding/json" + stderrors "errors" "github.com/go-openapi/errors" "github.com/go-openapi/strfmt" @@ -19,7 +20,6 @@ import ( // // swagger:model detailedSegmentAllOf0 type DetailedSegmentAllOf0 struct { - // activity type // Enum: ["Ride","Run"] ActivityType string `json:"activity_type,omitempty"` @@ -103,7 +103,7 @@ func (m *DetailedSegmentAllOf0) Validate(formats strfmt.Registry) error { return nil } -var detailedSegmentAllOf0TypeActivityTypePropEnum []interface{} +var detailedSegmentAllOf0TypeActivityTypePropEnum []any func init() { var res []string @@ -152,11 +152,15 @@ func (m *DetailedSegmentAllOf0) validateAthletePrEffort(formats strfmt.Registry) if m.AthletePrEffort != nil { if err := m.AthletePrEffort.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("athlete_pr_effort") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("athlete_pr_effort") } + return err } } @@ -171,11 +175,15 @@ func (m *DetailedSegmentAllOf0) validateAthleteSegmentStats(formats strfmt.Regis if m.AthleteSegmentStats != nil { if err := m.AthleteSegmentStats.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("athlete_segment_stats") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("athlete_segment_stats") } + return err } } @@ -189,11 +197,15 @@ func (m *DetailedSegmentAllOf0) validateEndLatlng(formats strfmt.Registry) error } if err := m.EndLatlng.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("end_latlng") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("end_latlng") } + return err } @@ -206,11 +218,15 @@ func (m *DetailedSegmentAllOf0) validateStartLatlng(formats strfmt.Registry) err } if err := m.StartLatlng.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("start_latlng") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("start_latlng") } + return err } @@ -244,7 +260,6 @@ func (m *DetailedSegmentAllOf0) ContextValidate(ctx context.Context, formats str } func (m *DetailedSegmentAllOf0) contextValidateAthletePrEffort(ctx context.Context, formats strfmt.Registry) error { - if m.AthletePrEffort != nil { if swag.IsZero(m.AthletePrEffort) { // not required @@ -252,11 +267,15 @@ func (m *DetailedSegmentAllOf0) contextValidateAthletePrEffort(ctx context.Conte } if err := m.AthletePrEffort.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("athlete_pr_effort") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("athlete_pr_effort") } + return err } } @@ -265,7 +284,6 @@ func (m *DetailedSegmentAllOf0) contextValidateAthletePrEffort(ctx context.Conte } func (m *DetailedSegmentAllOf0) contextValidateAthleteSegmentStats(ctx context.Context, formats strfmt.Registry) error { - if m.AthleteSegmentStats != nil { if swag.IsZero(m.AthleteSegmentStats) { // not required @@ -273,11 +291,15 @@ func (m *DetailedSegmentAllOf0) contextValidateAthleteSegmentStats(ctx context.C } if err := m.AthleteSegmentStats.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("athlete_segment_stats") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("athlete_segment_stats") } + return err } } @@ -286,13 +308,16 @@ func (m *DetailedSegmentAllOf0) contextValidateAthleteSegmentStats(ctx context.C } func (m *DetailedSegmentAllOf0) contextValidateEndLatlng(ctx context.Context, formats strfmt.Registry) error { - if err := m.EndLatlng.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("end_latlng") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("end_latlng") } + return err } @@ -300,13 +325,16 @@ func (m *DetailedSegmentAllOf0) contextValidateEndLatlng(ctx context.Context, fo } func (m *DetailedSegmentAllOf0) contextValidateStartLatlng(ctx context.Context, formats strfmt.Registry) error { - if err := m.StartLatlng.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("start_latlng") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("start_latlng") } + return err } diff --git a/internal/gen/strava-api-go/models/detailed_segment_effort.go b/internal/gen/strava-api-go/models/detailed_segment_effort.go index 10f3e57..9829d62 100644 --- a/internal/gen/strava-api-go/models/detailed_segment_effort.go +++ b/internal/gen/strava-api-go/models/detailed_segment_effort.go @@ -7,6 +7,7 @@ package models import ( "context" + stderrors "errors" "github.com/go-openapi/errors" "github.com/go-openapi/strfmt" @@ -263,18 +264,21 @@ func (m *DetailedSegmentEffort) Validate(formats strfmt.Registry) error { } func (m *DetailedSegmentEffort) validateActivity(formats strfmt.Registry) error { - if swag.IsZero(m.Activity) { // not required return nil } if m.Activity != nil { if err := m.Activity.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("activity") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("activity") } + return err } } @@ -283,18 +287,21 @@ func (m *DetailedSegmentEffort) validateActivity(formats strfmt.Registry) error } func (m *DetailedSegmentEffort) validateAthlete(formats strfmt.Registry) error { - if swag.IsZero(m.Athlete) { // not required return nil } if m.Athlete != nil { if err := m.Athlete.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("athlete") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("athlete") } + return err } } @@ -303,7 +310,6 @@ func (m *DetailedSegmentEffort) validateAthlete(formats strfmt.Registry) error { } func (m *DetailedSegmentEffort) validateKomRank(formats strfmt.Registry) error { - if swag.IsZero(m.KomRank) { // not required return nil } @@ -320,7 +326,6 @@ func (m *DetailedSegmentEffort) validateKomRank(formats strfmt.Registry) error { } func (m *DetailedSegmentEffort) validatePrRank(formats strfmt.Registry) error { - if swag.IsZero(m.PrRank) { // not required return nil } @@ -337,18 +342,21 @@ func (m *DetailedSegmentEffort) validatePrRank(formats strfmt.Registry) error { } func (m *DetailedSegmentEffort) validateSegment(formats strfmt.Registry) error { - if swag.IsZero(m.Segment) { // not required return nil } if m.Segment != nil { if err := m.Segment.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("segment") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("segment") } + return err } } @@ -384,7 +392,6 @@ func (m *DetailedSegmentEffort) ContextValidate(ctx context.Context, formats str } func (m *DetailedSegmentEffort) contextValidateActivity(ctx context.Context, formats strfmt.Registry) error { - if m.Activity != nil { if swag.IsZero(m.Activity) { // not required @@ -392,11 +399,15 @@ func (m *DetailedSegmentEffort) contextValidateActivity(ctx context.Context, for } if err := m.Activity.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("activity") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("activity") } + return err } } @@ -405,7 +416,6 @@ func (m *DetailedSegmentEffort) contextValidateActivity(ctx context.Context, for } func (m *DetailedSegmentEffort) contextValidateAthlete(ctx context.Context, formats strfmt.Registry) error { - if m.Athlete != nil { if swag.IsZero(m.Athlete) { // not required @@ -413,11 +423,15 @@ func (m *DetailedSegmentEffort) contextValidateAthlete(ctx context.Context, form } if err := m.Athlete.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("athlete") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("athlete") } + return err } } @@ -426,7 +440,6 @@ func (m *DetailedSegmentEffort) contextValidateAthlete(ctx context.Context, form } func (m *DetailedSegmentEffort) contextValidateSegment(ctx context.Context, formats strfmt.Registry) error { - if m.Segment != nil { if swag.IsZero(m.Segment) { // not required @@ -434,11 +447,15 @@ func (m *DetailedSegmentEffort) contextValidateSegment(ctx context.Context, form } if err := m.Segment.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("segment") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("segment") } + return err } } diff --git a/internal/gen/strava-api-go/models/error.go b/internal/gen/strava-api-go/models/error.go index 1603ad4..dc1683e 100644 --- a/internal/gen/strava-api-go/models/error.go +++ b/internal/gen/strava-api-go/models/error.go @@ -16,7 +16,6 @@ import ( // // swagger:model error type Error struct { - // The code associated with this error. Code string `json:"code,omitempty"` diff --git a/internal/gen/strava-api-go/models/explorer_response.go b/internal/gen/strava-api-go/models/explorer_response.go index e0f5a03..08c7da1 100644 --- a/internal/gen/strava-api-go/models/explorer_response.go +++ b/internal/gen/strava-api-go/models/explorer_response.go @@ -7,6 +7,7 @@ package models import ( "context" + stderrors "errors" "strconv" "github.com/go-openapi/errors" @@ -18,7 +19,6 @@ import ( // // swagger:model explorerResponse type ExplorerResponse struct { - // The set of segments matching an explorer request Segments []*ExplorerSegment `json:"segments"` } @@ -49,11 +49,15 @@ func (m *ExplorerResponse) validateSegments(formats strfmt.Registry) error { if m.Segments[i] != nil { if err := m.Segments[i].Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("segments" + "." + strconv.Itoa(i)) - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("segments" + "." + strconv.Itoa(i)) } + return err } } @@ -78,9 +82,7 @@ func (m *ExplorerResponse) ContextValidate(ctx context.Context, formats strfmt.R } func (m *ExplorerResponse) contextValidateSegments(ctx context.Context, formats strfmt.Registry) error { - for i := 0; i < len(m.Segments); i++ { - if m.Segments[i] != nil { if swag.IsZero(m.Segments[i]) { // not required @@ -88,15 +90,18 @@ func (m *ExplorerResponse) contextValidateSegments(ctx context.Context, formats } if err := m.Segments[i].ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("segments" + "." + strconv.Itoa(i)) - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("segments" + "." + strconv.Itoa(i)) } + return err } } - } return nil diff --git a/internal/gen/strava-api-go/models/explorer_segment.go b/internal/gen/strava-api-go/models/explorer_segment.go index 8c5c459..17aced3 100644 --- a/internal/gen/strava-api-go/models/explorer_segment.go +++ b/internal/gen/strava-api-go/models/explorer_segment.go @@ -8,6 +8,7 @@ package models import ( "context" "encoding/json" + stderrors "errors" "github.com/go-openapi/errors" "github.com/go-openapi/strfmt" @@ -19,7 +20,6 @@ import ( // // swagger:model explorerSegment type ExplorerSegment struct { - // The segment's average grade, in percents AvgGrade float32 `json:"avg_grade,omitempty"` @@ -96,7 +96,7 @@ func (m *ExplorerSegment) validateClimbCategory(formats strfmt.Registry) error { return nil } -var explorerSegmentTypeClimbCategoryDescPropEnum []interface{} +var explorerSegmentTypeClimbCategoryDescPropEnum []any func init() { var res []string @@ -156,11 +156,15 @@ func (m *ExplorerSegment) validateEndLatlng(formats strfmt.Registry) error { } if err := m.EndLatlng.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("end_latlng") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("end_latlng") } + return err } @@ -173,11 +177,15 @@ func (m *ExplorerSegment) validateStartLatlng(formats strfmt.Registry) error { } if err := m.StartLatlng.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("start_latlng") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("start_latlng") } + return err } @@ -203,13 +211,16 @@ func (m *ExplorerSegment) ContextValidate(ctx context.Context, formats strfmt.Re } func (m *ExplorerSegment) contextValidateEndLatlng(ctx context.Context, formats strfmt.Registry) error { - if err := m.EndLatlng.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("end_latlng") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("end_latlng") } + return err } @@ -217,13 +228,16 @@ func (m *ExplorerSegment) contextValidateEndLatlng(ctx context.Context, formats } func (m *ExplorerSegment) contextValidateStartLatlng(ctx context.Context, formats strfmt.Registry) error { - if err := m.StartLatlng.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("start_latlng") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("start_latlng") } + return err } diff --git a/internal/gen/strava-api-go/models/fault.go b/internal/gen/strava-api-go/models/fault.go index 8861f3b..994233a 100644 --- a/internal/gen/strava-api-go/models/fault.go +++ b/internal/gen/strava-api-go/models/fault.go @@ -7,6 +7,7 @@ package models import ( "context" + stderrors "errors" "strconv" "github.com/go-openapi/errors" @@ -18,7 +19,6 @@ import ( // // swagger:model fault type Fault struct { - // The set of specific errors associated with this fault, if any. Errors []*Error `json:"errors"` @@ -52,11 +52,15 @@ func (m *Fault) validateErrors(formats strfmt.Registry) error { if m.Errors[i] != nil { if err := m.Errors[i].Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("errors" + "." + strconv.Itoa(i)) - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("errors" + "." + strconv.Itoa(i)) } + return err } } @@ -81,9 +85,7 @@ func (m *Fault) ContextValidate(ctx context.Context, formats strfmt.Registry) er } func (m *Fault) contextValidateErrors(ctx context.Context, formats strfmt.Registry) error { - for i := 0; i < len(m.Errors); i++ { - if m.Errors[i] != nil { if swag.IsZero(m.Errors[i]) { // not required @@ -91,15 +93,18 @@ func (m *Fault) contextValidateErrors(ctx context.Context, formats strfmt.Regist } if err := m.Errors[i].ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("errors" + "." + strconv.Itoa(i)) - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("errors" + "." + strconv.Itoa(i)) } + return err } } - } return nil diff --git a/internal/gen/strava-api-go/models/heart_rate_details.go b/internal/gen/strava-api-go/models/heart_rate_details.go index a29ef94..25904e5 100644 --- a/internal/gen/strava-api-go/models/heart_rate_details.go +++ b/internal/gen/strava-api-go/models/heart_rate_details.go @@ -16,7 +16,6 @@ import ( // // swagger:model heartRateDetails type HeartRateDetails struct { - // The heart heart rate of the athlete during this effort AverageHeartrate float32 `json:"average_heartrate,omitempty"` diff --git a/internal/gen/strava-api-go/models/heart_rate_zone_ranges.go b/internal/gen/strava-api-go/models/heart_rate_zone_ranges.go index 681f2b3..8a7f7a0 100644 --- a/internal/gen/strava-api-go/models/heart_rate_zone_ranges.go +++ b/internal/gen/strava-api-go/models/heart_rate_zone_ranges.go @@ -7,6 +7,7 @@ package models import ( "context" + stderrors "errors" "github.com/go-openapi/errors" "github.com/go-openapi/strfmt" @@ -17,7 +18,6 @@ import ( // // swagger:model heartRateZoneRanges type HeartRateZoneRanges struct { - // Whether the athlete has set their own custom heart rate zones CustomZones bool `json:"custom_zones,omitempty"` @@ -45,11 +45,15 @@ func (m *HeartRateZoneRanges) validateZones(formats strfmt.Registry) error { } if err := m.Zones.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("zones") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("zones") } + return err } @@ -71,13 +75,16 @@ func (m *HeartRateZoneRanges) ContextValidate(ctx context.Context, formats strfm } func (m *HeartRateZoneRanges) contextValidateZones(ctx context.Context, formats strfmt.Registry) error { - if err := m.Zones.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("zones") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("zones") } + return err } diff --git a/internal/gen/strava-api-go/models/lap.go b/internal/gen/strava-api-go/models/lap.go index 2e09abb..e2e4ae7 100644 --- a/internal/gen/strava-api-go/models/lap.go +++ b/internal/gen/strava-api-go/models/lap.go @@ -7,6 +7,7 @@ package models import ( "context" + stderrors "errors" "github.com/go-openapi/errors" "github.com/go-openapi/strfmt" @@ -18,7 +19,6 @@ import ( // // swagger:model lap type Lap struct { - // activity Activity *MetaActivity `json:"activity,omitempty"` @@ -109,11 +109,15 @@ func (m *Lap) validateActivity(formats strfmt.Registry) error { if m.Activity != nil { if err := m.Activity.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("activity") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("activity") } + return err } } @@ -128,11 +132,15 @@ func (m *Lap) validateAthlete(formats strfmt.Registry) error { if m.Athlete != nil { if err := m.Athlete.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("athlete") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("athlete") } + return err } } @@ -183,7 +191,6 @@ func (m *Lap) ContextValidate(ctx context.Context, formats strfmt.Registry) erro } func (m *Lap) contextValidateActivity(ctx context.Context, formats strfmt.Registry) error { - if m.Activity != nil { if swag.IsZero(m.Activity) { // not required @@ -191,11 +198,15 @@ func (m *Lap) contextValidateActivity(ctx context.Context, formats strfmt.Regist } if err := m.Activity.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("activity") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("activity") } + return err } } @@ -204,7 +215,6 @@ func (m *Lap) contextValidateActivity(ctx context.Context, formats strfmt.Regist } func (m *Lap) contextValidateAthlete(ctx context.Context, formats strfmt.Registry) error { - if m.Athlete != nil { if swag.IsZero(m.Athlete) { // not required @@ -212,11 +222,15 @@ func (m *Lap) contextValidateAthlete(ctx context.Context, formats strfmt.Registr } if err := m.Athlete.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("athlete") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("athlete") } + return err } } diff --git a/internal/gen/strava-api-go/models/lat_lng_stream.go b/internal/gen/strava-api-go/models/lat_lng_stream.go index 3519b33..ee55550 100644 --- a/internal/gen/strava-api-go/models/lat_lng_stream.go +++ b/internal/gen/strava-api-go/models/lat_lng_stream.go @@ -7,6 +7,7 @@ package models import ( "context" + stderrors "errors" "strconv" "github.com/go-openapi/errors" @@ -89,22 +90,23 @@ func (m *LatLngStream) Validate(formats strfmt.Registry) error { } func (m *LatLngStream) validateData(formats strfmt.Registry) error { - if swag.IsZero(m.Data) { // not required return nil } for i := 0; i < len(m.Data); i++ { - if err := m.Data[i].Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("data" + "." + strconv.Itoa(i)) - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("data" + "." + strconv.Itoa(i)) } + return err } - } return nil @@ -130,18 +132,19 @@ func (m *LatLngStream) ContextValidate(ctx context.Context, formats strfmt.Regis } func (m *LatLngStream) contextValidateData(ctx context.Context, formats strfmt.Registry) error { - for i := 0; i < len(m.Data); i++ { - if err := m.Data[i].ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("data" + "." + strconv.Itoa(i)) - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("data" + "." + strconv.Itoa(i)) } + return err } - } return nil diff --git a/internal/gen/strava-api-go/models/meta_activity.go b/internal/gen/strava-api-go/models/meta_activity.go index fdb8fbc..78e8eb7 100644 --- a/internal/gen/strava-api-go/models/meta_activity.go +++ b/internal/gen/strava-api-go/models/meta_activity.go @@ -16,7 +16,6 @@ import ( // // swagger:model metaActivity type MetaActivity struct { - // The unique identifier of the activity ID int64 `json:"id,omitempty"` } diff --git a/internal/gen/strava-api-go/models/meta_athlete.go b/internal/gen/strava-api-go/models/meta_athlete.go index c1fbeb7..e45b97f 100644 --- a/internal/gen/strava-api-go/models/meta_athlete.go +++ b/internal/gen/strava-api-go/models/meta_athlete.go @@ -16,7 +16,6 @@ import ( // // swagger:model metaAthlete type MetaAthlete struct { - // The unique identifier of the athlete ID int64 `json:"id,omitempty"` } diff --git a/internal/gen/strava-api-go/models/meta_club.go b/internal/gen/strava-api-go/models/meta_club.go index 18eafa5..3aba95c 100644 --- a/internal/gen/strava-api-go/models/meta_club.go +++ b/internal/gen/strava-api-go/models/meta_club.go @@ -16,7 +16,6 @@ import ( // // swagger:model metaClub type MetaClub struct { - // The club's unique identifier. ID int64 `json:"id,omitempty"` diff --git a/internal/gen/strava-api-go/models/photos_summary.go b/internal/gen/strava-api-go/models/photos_summary.go index 9b1d8a6..4091966 100644 --- a/internal/gen/strava-api-go/models/photos_summary.go +++ b/internal/gen/strava-api-go/models/photos_summary.go @@ -7,6 +7,7 @@ package models import ( "context" + stderrors "errors" "github.com/go-openapi/errors" "github.com/go-openapi/strfmt" @@ -17,7 +18,6 @@ import ( // // swagger:model photosSummary type PhotosSummary struct { - // The number of photos Count int64 `json:"count,omitempty"` @@ -46,11 +46,15 @@ func (m *PhotosSummary) validatePrimary(formats strfmt.Registry) error { if m.Primary != nil { if err := m.Primary.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("primary") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("primary") } + return err } } @@ -73,7 +77,6 @@ func (m *PhotosSummary) ContextValidate(ctx context.Context, formats strfmt.Regi } func (m *PhotosSummary) contextValidatePrimary(ctx context.Context, formats strfmt.Registry) error { - if m.Primary != nil { if swag.IsZero(m.Primary) { // not required @@ -81,11 +84,15 @@ func (m *PhotosSummary) contextValidatePrimary(ctx context.Context, formats strf } if err := m.Primary.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("primary") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("primary") } + return err } } @@ -115,7 +122,6 @@ func (m *PhotosSummary) UnmarshalBinary(b []byte) error { // // swagger:model PhotosSummaryPrimary type PhotosSummaryPrimary struct { - // id ID int64 `json:"id,omitempty"` diff --git a/internal/gen/strava-api-go/models/polyline_map.go b/internal/gen/strava-api-go/models/polyline_map.go index c5fbde0..d03ecdf 100644 --- a/internal/gen/strava-api-go/models/polyline_map.go +++ b/internal/gen/strava-api-go/models/polyline_map.go @@ -16,7 +16,6 @@ import ( // // swagger:model polylineMap type PolylineMap struct { - // The identifier of the map ID string `json:"id,omitempty"` diff --git a/internal/gen/strava-api-go/models/power_zone_ranges.go b/internal/gen/strava-api-go/models/power_zone_ranges.go index 3233116..738a826 100644 --- a/internal/gen/strava-api-go/models/power_zone_ranges.go +++ b/internal/gen/strava-api-go/models/power_zone_ranges.go @@ -7,6 +7,7 @@ package models import ( "context" + stderrors "errors" "github.com/go-openapi/errors" "github.com/go-openapi/strfmt" @@ -17,7 +18,6 @@ import ( // // swagger:model powerZoneRanges type PowerZoneRanges struct { - // zones Zones ZoneRanges `json:"zones,omitempty"` } @@ -42,11 +42,15 @@ func (m *PowerZoneRanges) validateZones(formats strfmt.Registry) error { } if err := m.Zones.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("zones") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("zones") } + return err } @@ -68,13 +72,16 @@ func (m *PowerZoneRanges) ContextValidate(ctx context.Context, formats strfmt.Re } func (m *PowerZoneRanges) contextValidateZones(ctx context.Context, formats strfmt.Registry) error { - if err := m.Zones.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("zones") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("zones") } + return err } diff --git a/internal/gen/strava-api-go/models/route.go b/internal/gen/strava-api-go/models/route.go index 24f1747..b396ab4 100644 --- a/internal/gen/strava-api-go/models/route.go +++ b/internal/gen/strava-api-go/models/route.go @@ -7,6 +7,7 @@ package models import ( "context" + stderrors "errors" "strconv" "github.com/go-openapi/errors" @@ -19,7 +20,6 @@ import ( // // swagger:model route type Route struct { - // athlete Athlete *CommentAthlete `json:"athlete,omitempty"` @@ -119,11 +119,15 @@ func (m *Route) validateAthlete(formats strfmt.Registry) error { if m.Athlete != nil { if err := m.Athlete.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("athlete") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("athlete") } + return err } } @@ -150,11 +154,15 @@ func (m *Route) validateMap(formats strfmt.Registry) error { if m.Map != nil { if err := m.Map.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("map") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("map") } + return err } } @@ -174,11 +182,15 @@ func (m *Route) validateSegments(formats strfmt.Registry) error { if m.Segments[i] != nil { if err := m.Segments[i].Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("segments" + "." + strconv.Itoa(i)) - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("segments" + "." + strconv.Itoa(i)) } + return err } } @@ -218,11 +230,15 @@ func (m *Route) validateWaypoints(formats strfmt.Registry) error { if m.Waypoints[i] != nil { if err := m.Waypoints[i].Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("waypoints" + "." + strconv.Itoa(i)) - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("waypoints" + "." + strconv.Itoa(i)) } + return err } } @@ -259,7 +275,6 @@ func (m *Route) ContextValidate(ctx context.Context, formats strfmt.Registry) er } func (m *Route) contextValidateAthlete(ctx context.Context, formats strfmt.Registry) error { - if m.Athlete != nil { if swag.IsZero(m.Athlete) { // not required @@ -267,11 +282,15 @@ func (m *Route) contextValidateAthlete(ctx context.Context, formats strfmt.Regis } if err := m.Athlete.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("athlete") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("athlete") } + return err } } @@ -280,7 +299,6 @@ func (m *Route) contextValidateAthlete(ctx context.Context, formats strfmt.Regis } func (m *Route) contextValidateMap(ctx context.Context, formats strfmt.Registry) error { - if m.Map != nil { if swag.IsZero(m.Map) { // not required @@ -288,11 +306,15 @@ func (m *Route) contextValidateMap(ctx context.Context, formats strfmt.Registry) } if err := m.Map.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("map") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("map") } + return err } } @@ -301,9 +323,7 @@ func (m *Route) contextValidateMap(ctx context.Context, formats strfmt.Registry) } func (m *Route) contextValidateSegments(ctx context.Context, formats strfmt.Registry) error { - for i := 0; i < len(m.Segments); i++ { - if m.Segments[i] != nil { if swag.IsZero(m.Segments[i]) { // not required @@ -311,24 +331,25 @@ func (m *Route) contextValidateSegments(ctx context.Context, formats strfmt.Regi } if err := m.Segments[i].ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("segments" + "." + strconv.Itoa(i)) - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("segments" + "." + strconv.Itoa(i)) } + return err } } - } return nil } func (m *Route) contextValidateWaypoints(ctx context.Context, formats strfmt.Registry) error { - for i := 0; i < len(m.Waypoints); i++ { - if m.Waypoints[i] != nil { if swag.IsZero(m.Waypoints[i]) { // not required @@ -336,15 +357,18 @@ func (m *Route) contextValidateWaypoints(ctx context.Context, formats strfmt.Reg } if err := m.Waypoints[i].ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("waypoints" + "." + strconv.Itoa(i)) - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("waypoints" + "." + strconv.Itoa(i)) } + return err } } - } return nil diff --git a/internal/gen/strava-api-go/models/split.go b/internal/gen/strava-api-go/models/split.go index 90ebf1c..8910a91 100644 --- a/internal/gen/strava-api-go/models/split.go +++ b/internal/gen/strava-api-go/models/split.go @@ -16,7 +16,6 @@ import ( // // swagger:model split type Split struct { - // The average speed of this split, in meters per second AverageSpeed float32 `json:"average_speed,omitempty"` diff --git a/internal/gen/strava-api-go/models/sport_type.go b/internal/gen/strava-api-go/models/sport_type.go index d28ee39..e254c21 100644 --- a/internal/gen/strava-api-go/models/sport_type.go +++ b/internal/gen/strava-api-go/models/sport_type.go @@ -182,7 +182,7 @@ const ( ) // for schema -var sportTypeEnum []interface{} +var sportTypeEnum []any func init() { var res []SportType diff --git a/internal/gen/strava-api-go/models/stream_set.go b/internal/gen/strava-api-go/models/stream_set.go index bd4fab1..f14b8db 100644 --- a/internal/gen/strava-api-go/models/stream_set.go +++ b/internal/gen/strava-api-go/models/stream_set.go @@ -7,6 +7,7 @@ package models import ( "context" + stderrors "errors" "github.com/go-openapi/errors" "github.com/go-openapi/strfmt" @@ -17,7 +18,6 @@ import ( // // swagger:model streamSet type StreamSet struct { - // altitude Altitude *AltitudeStream `json:"altitude,omitempty"` @@ -113,11 +113,15 @@ func (m *StreamSet) validateAltitude(formats strfmt.Registry) error { if m.Altitude != nil { if err := m.Altitude.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("altitude") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("altitude") } + return err } } @@ -132,11 +136,15 @@ func (m *StreamSet) validateCadence(formats strfmt.Registry) error { if m.Cadence != nil { if err := m.Cadence.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("cadence") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("cadence") } + return err } } @@ -151,11 +159,15 @@ func (m *StreamSet) validateDistance(formats strfmt.Registry) error { if m.Distance != nil { if err := m.Distance.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("distance") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("distance") } + return err } } @@ -170,11 +182,15 @@ func (m *StreamSet) validateGradeSmooth(formats strfmt.Registry) error { if m.GradeSmooth != nil { if err := m.GradeSmooth.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("grade_smooth") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("grade_smooth") } + return err } } @@ -189,11 +205,15 @@ func (m *StreamSet) validateHeartrate(formats strfmt.Registry) error { if m.Heartrate != nil { if err := m.Heartrate.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("heartrate") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("heartrate") } + return err } } @@ -208,11 +228,15 @@ func (m *StreamSet) validateLatlng(formats strfmt.Registry) error { if m.Latlng != nil { if err := m.Latlng.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("latlng") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("latlng") } + return err } } @@ -227,11 +251,15 @@ func (m *StreamSet) validateMoving(formats strfmt.Registry) error { if m.Moving != nil { if err := m.Moving.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("moving") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("moving") } + return err } } @@ -246,11 +274,15 @@ func (m *StreamSet) validateTemp(formats strfmt.Registry) error { if m.Temp != nil { if err := m.Temp.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("temp") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("temp") } + return err } } @@ -265,11 +297,15 @@ func (m *StreamSet) validateTime(formats strfmt.Registry) error { if m.Time != nil { if err := m.Time.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("time") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("time") } + return err } } @@ -284,11 +320,15 @@ func (m *StreamSet) validateVelocitySmooth(formats strfmt.Registry) error { if m.VelocitySmooth != nil { if err := m.VelocitySmooth.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("velocity_smooth") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("velocity_smooth") } + return err } } @@ -303,11 +343,15 @@ func (m *StreamSet) validateWatts(formats strfmt.Registry) error { if m.Watts != nil { if err := m.Watts.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("watts") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("watts") } + return err } } @@ -370,7 +414,6 @@ func (m *StreamSet) ContextValidate(ctx context.Context, formats strfmt.Registry } func (m *StreamSet) contextValidateAltitude(ctx context.Context, formats strfmt.Registry) error { - if m.Altitude != nil { if swag.IsZero(m.Altitude) { // not required @@ -378,11 +421,15 @@ func (m *StreamSet) contextValidateAltitude(ctx context.Context, formats strfmt. } if err := m.Altitude.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("altitude") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("altitude") } + return err } } @@ -391,7 +438,6 @@ func (m *StreamSet) contextValidateAltitude(ctx context.Context, formats strfmt. } func (m *StreamSet) contextValidateCadence(ctx context.Context, formats strfmt.Registry) error { - if m.Cadence != nil { if swag.IsZero(m.Cadence) { // not required @@ -399,11 +445,15 @@ func (m *StreamSet) contextValidateCadence(ctx context.Context, formats strfmt.R } if err := m.Cadence.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("cadence") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("cadence") } + return err } } @@ -412,7 +462,6 @@ func (m *StreamSet) contextValidateCadence(ctx context.Context, formats strfmt.R } func (m *StreamSet) contextValidateDistance(ctx context.Context, formats strfmt.Registry) error { - if m.Distance != nil { if swag.IsZero(m.Distance) { // not required @@ -420,11 +469,15 @@ func (m *StreamSet) contextValidateDistance(ctx context.Context, formats strfmt. } if err := m.Distance.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("distance") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("distance") } + return err } } @@ -433,7 +486,6 @@ func (m *StreamSet) contextValidateDistance(ctx context.Context, formats strfmt. } func (m *StreamSet) contextValidateGradeSmooth(ctx context.Context, formats strfmt.Registry) error { - if m.GradeSmooth != nil { if swag.IsZero(m.GradeSmooth) { // not required @@ -441,11 +493,15 @@ func (m *StreamSet) contextValidateGradeSmooth(ctx context.Context, formats strf } if err := m.GradeSmooth.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("grade_smooth") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("grade_smooth") } + return err } } @@ -454,7 +510,6 @@ func (m *StreamSet) contextValidateGradeSmooth(ctx context.Context, formats strf } func (m *StreamSet) contextValidateHeartrate(ctx context.Context, formats strfmt.Registry) error { - if m.Heartrate != nil { if swag.IsZero(m.Heartrate) { // not required @@ -462,11 +517,15 @@ func (m *StreamSet) contextValidateHeartrate(ctx context.Context, formats strfmt } if err := m.Heartrate.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("heartrate") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("heartrate") } + return err } } @@ -475,7 +534,6 @@ func (m *StreamSet) contextValidateHeartrate(ctx context.Context, formats strfmt } func (m *StreamSet) contextValidateLatlng(ctx context.Context, formats strfmt.Registry) error { - if m.Latlng != nil { if swag.IsZero(m.Latlng) { // not required @@ -483,11 +541,15 @@ func (m *StreamSet) contextValidateLatlng(ctx context.Context, formats strfmt.Re } if err := m.Latlng.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("latlng") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("latlng") } + return err } } @@ -496,7 +558,6 @@ func (m *StreamSet) contextValidateLatlng(ctx context.Context, formats strfmt.Re } func (m *StreamSet) contextValidateMoving(ctx context.Context, formats strfmt.Registry) error { - if m.Moving != nil { if swag.IsZero(m.Moving) { // not required @@ -504,11 +565,15 @@ func (m *StreamSet) contextValidateMoving(ctx context.Context, formats strfmt.Re } if err := m.Moving.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("moving") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("moving") } + return err } } @@ -517,7 +582,6 @@ func (m *StreamSet) contextValidateMoving(ctx context.Context, formats strfmt.Re } func (m *StreamSet) contextValidateTemp(ctx context.Context, formats strfmt.Registry) error { - if m.Temp != nil { if swag.IsZero(m.Temp) { // not required @@ -525,11 +589,15 @@ func (m *StreamSet) contextValidateTemp(ctx context.Context, formats strfmt.Regi } if err := m.Temp.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("temp") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("temp") } + return err } } @@ -538,7 +606,6 @@ func (m *StreamSet) contextValidateTemp(ctx context.Context, formats strfmt.Regi } func (m *StreamSet) contextValidateTime(ctx context.Context, formats strfmt.Registry) error { - if m.Time != nil { if swag.IsZero(m.Time) { // not required @@ -546,11 +613,15 @@ func (m *StreamSet) contextValidateTime(ctx context.Context, formats strfmt.Regi } if err := m.Time.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("time") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("time") } + return err } } @@ -559,7 +630,6 @@ func (m *StreamSet) contextValidateTime(ctx context.Context, formats strfmt.Regi } func (m *StreamSet) contextValidateVelocitySmooth(ctx context.Context, formats strfmt.Registry) error { - if m.VelocitySmooth != nil { if swag.IsZero(m.VelocitySmooth) { // not required @@ -567,11 +637,15 @@ func (m *StreamSet) contextValidateVelocitySmooth(ctx context.Context, formats s } if err := m.VelocitySmooth.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("velocity_smooth") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("velocity_smooth") } + return err } } @@ -580,7 +654,6 @@ func (m *StreamSet) contextValidateVelocitySmooth(ctx context.Context, formats s } func (m *StreamSet) contextValidateWatts(ctx context.Context, formats strfmt.Registry) error { - if m.Watts != nil { if swag.IsZero(m.Watts) { // not required @@ -588,11 +661,15 @@ func (m *StreamSet) contextValidateWatts(ctx context.Context, formats strfmt.Reg } if err := m.Watts.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("watts") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("watts") } + return err } } diff --git a/internal/gen/strava-api-go/models/summary_activity.go b/internal/gen/strava-api-go/models/summary_activity.go index fb08871..1e0b4ff 100644 --- a/internal/gen/strava-api-go/models/summary_activity.go +++ b/internal/gen/strava-api-go/models/summary_activity.go @@ -7,6 +7,7 @@ package models import ( "context" + stderrors "errors" "github.com/go-openapi/errors" "github.com/go-openapi/strfmt" @@ -44,6 +45,9 @@ type SummaryActivity struct { // Whether this activity is a commute Commute bool `json:"commute,omitempty"` + // The name of the device used to record the activity + DeviceName string `json:"device_name,omitempty"` + // Whether the watts are from a power meter, false if estimated DeviceWatts bool `json:"device_watts,omitempty"` @@ -181,6 +185,8 @@ func (m *SummaryActivity) UnmarshalJSON(raw []byte) error { Commute bool `json:"commute,omitempty"` + DeviceName string `json:"device_name,omitempty"` + DeviceWatts bool `json:"device_watts,omitempty"` Distance float32 `json:"distance,omitempty"` @@ -267,6 +273,8 @@ func (m *SummaryActivity) UnmarshalJSON(raw []byte) error { m.Commute = dataAO2.Commute + m.DeviceName = dataAO2.DeviceName + m.DeviceWatts = dataAO2.DeviceWatts m.Distance = dataAO2.Distance @@ -368,6 +376,8 @@ func (m SummaryActivity) MarshalJSON() ([]byte, error) { Commute bool `json:"commute,omitempty"` + DeviceName string `json:"device_name,omitempty"` + DeviceWatts bool `json:"device_watts,omitempty"` Distance float32 `json:"distance,omitempty"` @@ -451,6 +461,8 @@ func (m SummaryActivity) MarshalJSON() ([]byte, error) { dataAO2.Commute = m.Commute + dataAO2.DeviceName = m.DeviceName + dataAO2.DeviceWatts = m.DeviceWatts dataAO2.Distance = m.Distance @@ -583,18 +595,21 @@ func (m *SummaryActivity) Validate(formats strfmt.Registry) error { } func (m *SummaryActivity) validateAthlete(formats strfmt.Registry) error { - if swag.IsZero(m.Athlete) { // not required return nil } if m.Athlete != nil { if err := m.Athlete.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("athlete") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("athlete") } + return err } } @@ -603,7 +618,6 @@ func (m *SummaryActivity) validateAthlete(formats strfmt.Registry) error { } func (m *SummaryActivity) validateAthleteCount(formats strfmt.Registry) error { - if swag.IsZero(m.AthleteCount) { // not required return nil } @@ -616,17 +630,20 @@ func (m *SummaryActivity) validateAthleteCount(formats strfmt.Registry) error { } func (m *SummaryActivity) validateEndLatlng(formats strfmt.Registry) error { - if swag.IsZero(m.EndLatlng) { // not required return nil } if err := m.EndLatlng.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("end_latlng") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("end_latlng") } + return err } @@ -634,18 +651,21 @@ func (m *SummaryActivity) validateEndLatlng(formats strfmt.Registry) error { } func (m *SummaryActivity) validateMap(formats strfmt.Registry) error { - if swag.IsZero(m.Map) { // not required return nil } if m.Map != nil { if err := m.Map.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("map") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("map") } + return err } } @@ -654,17 +674,20 @@ func (m *SummaryActivity) validateMap(formats strfmt.Registry) error { } func (m *SummaryActivity) validateSportType(formats strfmt.Registry) error { - if swag.IsZero(m.SportType) { // not required return nil } if err := m.SportType.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("sport_type") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("sport_type") } + return err } @@ -672,7 +695,6 @@ func (m *SummaryActivity) validateSportType(formats strfmt.Registry) error { } func (m *SummaryActivity) validateStartDate(formats strfmt.Registry) error { - if swag.IsZero(m.StartDate) { // not required return nil } @@ -685,7 +707,6 @@ func (m *SummaryActivity) validateStartDate(formats strfmt.Registry) error { } func (m *SummaryActivity) validateStartDateLocal(formats strfmt.Registry) error { - if swag.IsZero(m.StartDateLocal) { // not required return nil } @@ -698,17 +719,20 @@ func (m *SummaryActivity) validateStartDateLocal(formats strfmt.Registry) error } func (m *SummaryActivity) validateStartLatlng(formats strfmt.Registry) error { - if swag.IsZero(m.StartLatlng) { // not required return nil } if err := m.StartLatlng.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("start_latlng") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("start_latlng") } + return err } @@ -716,17 +740,20 @@ func (m *SummaryActivity) validateStartLatlng(formats strfmt.Registry) error { } func (m *SummaryActivity) validateType(formats strfmt.Registry) error { - if swag.IsZero(m.Type) { // not required return nil } if err := m.Type.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("type") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("type") } + return err } @@ -777,7 +804,6 @@ func (m *SummaryActivity) ContextValidate(ctx context.Context, formats strfmt.Re } func (m *SummaryActivity) contextValidateAthlete(ctx context.Context, formats strfmt.Registry) error { - if m.Athlete != nil { if swag.IsZero(m.Athlete) { // not required @@ -785,11 +811,15 @@ func (m *SummaryActivity) contextValidateAthlete(ctx context.Context, formats st } if err := m.Athlete.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("athlete") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("athlete") } + return err } } @@ -798,13 +828,16 @@ func (m *SummaryActivity) contextValidateAthlete(ctx context.Context, formats st } func (m *SummaryActivity) contextValidateEndLatlng(ctx context.Context, formats strfmt.Registry) error { - if err := m.EndLatlng.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("end_latlng") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("end_latlng") } + return err } @@ -812,7 +845,6 @@ func (m *SummaryActivity) contextValidateEndLatlng(ctx context.Context, formats } func (m *SummaryActivity) contextValidateMap(ctx context.Context, formats strfmt.Registry) error { - if m.Map != nil { if swag.IsZero(m.Map) { // not required @@ -820,11 +852,15 @@ func (m *SummaryActivity) contextValidateMap(ctx context.Context, formats strfmt } if err := m.Map.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("map") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("map") } + return err } } @@ -833,17 +869,20 @@ func (m *SummaryActivity) contextValidateMap(ctx context.Context, formats strfmt } func (m *SummaryActivity) contextValidateSportType(ctx context.Context, formats strfmt.Registry) error { - if swag.IsZero(m.SportType) { // not required return nil } if err := m.SportType.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("sport_type") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("sport_type") } + return err } @@ -851,13 +890,16 @@ func (m *SummaryActivity) contextValidateSportType(ctx context.Context, formats } func (m *SummaryActivity) contextValidateStartLatlng(ctx context.Context, formats strfmt.Registry) error { - if err := m.StartLatlng.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("start_latlng") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("start_latlng") } + return err } @@ -865,17 +907,20 @@ func (m *SummaryActivity) contextValidateStartLatlng(ctx context.Context, format } func (m *SummaryActivity) contextValidateType(ctx context.Context, formats strfmt.Registry) error { - if swag.IsZero(m.Type) { // not required return nil } if err := m.Type.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("type") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("type") } + return err } diff --git a/internal/gen/strava-api-go/models/summary_athlete.go b/internal/gen/strava-api-go/models/summary_athlete.go index bb19cad..2c85b71 100644 --- a/internal/gen/strava-api-go/models/summary_athlete.go +++ b/internal/gen/strava-api-go/models/summary_athlete.go @@ -233,7 +233,6 @@ func (m *SummaryAthlete) Validate(formats strfmt.Registry) error { } func (m *SummaryAthlete) validateCreatedAt(formats strfmt.Registry) error { - if swag.IsZero(m.CreatedAt) { // not required return nil } @@ -245,7 +244,7 @@ func (m *SummaryAthlete) validateCreatedAt(formats strfmt.Registry) error { return nil } -var summaryAthleteTypeSexPropEnum []interface{} +var summaryAthleteTypeSexPropEnum []any func init() { var res []string @@ -266,7 +265,6 @@ func (m *SummaryAthlete) validateSexEnum(path, location string, value string) er } func (m *SummaryAthlete) validateSex(formats strfmt.Registry) error { - if swag.IsZero(m.Sex) { // not required return nil } @@ -280,7 +278,6 @@ func (m *SummaryAthlete) validateSex(formats strfmt.Registry) error { } func (m *SummaryAthlete) validateUpdatedAt(formats strfmt.Registry) error { - if swag.IsZero(m.UpdatedAt) { // not required return nil } diff --git a/internal/gen/strava-api-go/models/summary_club.go b/internal/gen/strava-api-go/models/summary_club.go index 600c650..c0855eb 100644 --- a/internal/gen/strava-api-go/models/summary_club.go +++ b/internal/gen/strava-api-go/models/summary_club.go @@ -8,6 +8,7 @@ package models import ( "context" "encoding/json" + stderrors "errors" "strconv" "github.com/go-openapi/errors" @@ -228,28 +229,29 @@ func (m *SummaryClub) Validate(formats strfmt.Registry) error { } func (m *SummaryClub) validateActivityTypes(formats strfmt.Registry) error { - if swag.IsZero(m.ActivityTypes) { // not required return nil } for i := 0; i < len(m.ActivityTypes); i++ { - if err := m.ActivityTypes[i].Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("activity_types" + "." + strconv.Itoa(i)) - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("activity_types" + "." + strconv.Itoa(i)) } + return err } - } return nil } -var summaryClubTypeSportTypePropEnum []interface{} +var summaryClubTypeSportTypePropEnum []any func init() { var res []string @@ -270,7 +272,6 @@ func (m *SummaryClub) validateSportTypeEnum(path, location string, value string) } func (m *SummaryClub) validateSportType(formats strfmt.Registry) error { - if swag.IsZero(m.SportType) { // not required return nil } @@ -303,7 +304,6 @@ func (m *SummaryClub) ContextValidate(ctx context.Context, formats strfmt.Regist } func (m *SummaryClub) contextValidateActivityTypes(ctx context.Context, formats strfmt.Registry) error { - for i := 0; i < len(m.ActivityTypes); i++ { if swag.IsZero(m.ActivityTypes[i]) { // not required @@ -311,11 +311,15 @@ func (m *SummaryClub) contextValidateActivityTypes(ctx context.Context, formats } if err := m.ActivityTypes[i].ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("activity_types" + "." + strconv.Itoa(i)) - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("activity_types" + "." + strconv.Itoa(i)) } + return err } diff --git a/internal/gen/strava-api-go/models/summary_gear.go b/internal/gen/strava-api-go/models/summary_gear.go index 3bddc7f..fb7ee4a 100644 --- a/internal/gen/strava-api-go/models/summary_gear.go +++ b/internal/gen/strava-api-go/models/summary_gear.go @@ -16,7 +16,6 @@ import ( // // swagger:model summaryGear type SummaryGear struct { - // The distance logged with this gear. Distance float32 `json:"distance,omitempty"` diff --git a/internal/gen/strava-api-go/models/summary_p_r_segment_effort.go b/internal/gen/strava-api-go/models/summary_p_r_segment_effort.go index 9b778df..3cc47bf 100644 --- a/internal/gen/strava-api-go/models/summary_p_r_segment_effort.go +++ b/internal/gen/strava-api-go/models/summary_p_r_segment_effort.go @@ -18,7 +18,6 @@ import ( // // swagger:model summaryPRSegmentEffort type SummaryPRSegmentEffort struct { - // Number of efforts by the authenticated athlete on this segment. EffortCount int64 `json:"effort_count,omitempty"` diff --git a/internal/gen/strava-api-go/models/summary_segment.go b/internal/gen/strava-api-go/models/summary_segment.go index 144a5d7..ff3c3cf 100644 --- a/internal/gen/strava-api-go/models/summary_segment.go +++ b/internal/gen/strava-api-go/models/summary_segment.go @@ -8,6 +8,7 @@ package models import ( "context" "encoding/json" + stderrors "errors" "github.com/go-openapi/errors" "github.com/go-openapi/strfmt" @@ -19,7 +20,6 @@ import ( // // swagger:model summarySegment type SummarySegment struct { - // activity type // Enum: ["Ride","Run"] ActivityType string `json:"activity_type,omitempty"` @@ -103,7 +103,7 @@ func (m *SummarySegment) Validate(formats strfmt.Registry) error { return nil } -var summarySegmentTypeActivityTypePropEnum []interface{} +var summarySegmentTypeActivityTypePropEnum []any func init() { var res []string @@ -152,11 +152,15 @@ func (m *SummarySegment) validateAthletePrEffort(formats strfmt.Registry) error if m.AthletePrEffort != nil { if err := m.AthletePrEffort.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("athlete_pr_effort") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("athlete_pr_effort") } + return err } } @@ -171,11 +175,15 @@ func (m *SummarySegment) validateAthleteSegmentStats(formats strfmt.Registry) er if m.AthleteSegmentStats != nil { if err := m.AthleteSegmentStats.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("athlete_segment_stats") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("athlete_segment_stats") } + return err } } @@ -189,11 +197,15 @@ func (m *SummarySegment) validateEndLatlng(formats strfmt.Registry) error { } if err := m.EndLatlng.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("end_latlng") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("end_latlng") } + return err } @@ -206,11 +218,15 @@ func (m *SummarySegment) validateStartLatlng(formats strfmt.Registry) error { } if err := m.StartLatlng.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("start_latlng") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("start_latlng") } + return err } @@ -244,7 +260,6 @@ func (m *SummarySegment) ContextValidate(ctx context.Context, formats strfmt.Reg } func (m *SummarySegment) contextValidateAthletePrEffort(ctx context.Context, formats strfmt.Registry) error { - if m.AthletePrEffort != nil { if swag.IsZero(m.AthletePrEffort) { // not required @@ -252,11 +267,15 @@ func (m *SummarySegment) contextValidateAthletePrEffort(ctx context.Context, for } if err := m.AthletePrEffort.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("athlete_pr_effort") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("athlete_pr_effort") } + return err } } @@ -265,7 +284,6 @@ func (m *SummarySegment) contextValidateAthletePrEffort(ctx context.Context, for } func (m *SummarySegment) contextValidateAthleteSegmentStats(ctx context.Context, formats strfmt.Registry) error { - if m.AthleteSegmentStats != nil { if swag.IsZero(m.AthleteSegmentStats) { // not required @@ -273,11 +291,15 @@ func (m *SummarySegment) contextValidateAthleteSegmentStats(ctx context.Context, } if err := m.AthleteSegmentStats.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("athlete_segment_stats") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("athlete_segment_stats") } + return err } } @@ -286,13 +308,16 @@ func (m *SummarySegment) contextValidateAthleteSegmentStats(ctx context.Context, } func (m *SummarySegment) contextValidateEndLatlng(ctx context.Context, formats strfmt.Registry) error { - if err := m.EndLatlng.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("end_latlng") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("end_latlng") } + return err } @@ -300,13 +325,16 @@ func (m *SummarySegment) contextValidateEndLatlng(ctx context.Context, formats s } func (m *SummarySegment) contextValidateStartLatlng(ctx context.Context, formats strfmt.Registry) error { - if err := m.StartLatlng.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("start_latlng") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("start_latlng") } + return err } diff --git a/internal/gen/strava-api-go/models/summary_segment_effort.go b/internal/gen/strava-api-go/models/summary_segment_effort.go index f3ab46d..ff7295a 100644 --- a/internal/gen/strava-api-go/models/summary_segment_effort.go +++ b/internal/gen/strava-api-go/models/summary_segment_effort.go @@ -18,7 +18,6 @@ import ( // // swagger:model summarySegmentEffort type SummarySegmentEffort struct { - // The unique identifier of the activity related to this effort ActivityID int64 `json:"activity_id,omitempty"` diff --git a/internal/gen/strava-api-go/models/timed_zone_distribution.go b/internal/gen/strava-api-go/models/timed_zone_distribution.go index cd7a743..8473ac0 100644 --- a/internal/gen/strava-api-go/models/timed_zone_distribution.go +++ b/internal/gen/strava-api-go/models/timed_zone_distribution.go @@ -7,6 +7,7 @@ package models import ( "context" + stderrors "errors" "strconv" "github.com/go-openapi/errors" @@ -30,11 +31,15 @@ func (m TimedZoneDistribution) Validate(formats strfmt.Registry) error { if m[i] != nil { if err := m[i].Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName(strconv.Itoa(i)) - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName(strconv.Itoa(i)) } + return err } } @@ -52,7 +57,6 @@ func (m TimedZoneDistribution) ContextValidate(ctx context.Context, formats strf var res []error for i := 0; i < len(m); i++ { - if m[i] != nil { if swag.IsZero(m[i]) { // not required @@ -60,15 +64,18 @@ func (m TimedZoneDistribution) ContextValidate(ctx context.Context, formats strf } if err := m[i].ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName(strconv.Itoa(i)) - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName(strconv.Itoa(i)) } + return err } } - } if len(res) > 0 { diff --git a/internal/gen/strava-api-go/models/updatable_activity.go b/internal/gen/strava-api-go/models/updatable_activity.go index 6a986cb..9e8baea 100644 --- a/internal/gen/strava-api-go/models/updatable_activity.go +++ b/internal/gen/strava-api-go/models/updatable_activity.go @@ -7,6 +7,7 @@ package models import ( "context" + stderrors "errors" "github.com/go-openapi/errors" "github.com/go-openapi/strfmt" @@ -17,7 +18,6 @@ import ( // // swagger:model updatableActivity type UpdatableActivity struct { - // Whether this activity is a commute Commute bool `json:"commute,omitempty"` @@ -67,11 +67,15 @@ func (m *UpdatableActivity) validateSportType(formats strfmt.Registry) error { } if err := m.SportType.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("sport_type") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("sport_type") } + return err } @@ -84,11 +88,15 @@ func (m *UpdatableActivity) validateType(formats strfmt.Registry) error { } if err := m.Type.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("type") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("type") } + return err } @@ -114,17 +122,20 @@ func (m *UpdatableActivity) ContextValidate(ctx context.Context, formats strfmt. } func (m *UpdatableActivity) contextValidateSportType(ctx context.Context, formats strfmt.Registry) error { - if swag.IsZero(m.SportType) { // not required return nil } if err := m.SportType.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("sport_type") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("sport_type") } + return err } @@ -132,17 +143,20 @@ func (m *UpdatableActivity) contextValidateSportType(ctx context.Context, format } func (m *UpdatableActivity) contextValidateType(ctx context.Context, formats strfmt.Registry) error { - if swag.IsZero(m.Type) { // not required return nil } if err := m.Type.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("type") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("type") } + return err } diff --git a/internal/gen/strava-api-go/models/upload.go b/internal/gen/strava-api-go/models/upload.go index 069fe71..47e4438 100644 --- a/internal/gen/strava-api-go/models/upload.go +++ b/internal/gen/strava-api-go/models/upload.go @@ -16,7 +16,6 @@ import ( // // swagger:model upload type Upload struct { - // The identifier of the activity this upload resulted into ActivityID int64 `json:"activity_id,omitempty"` diff --git a/internal/gen/strava-api-go/models/waypoint.go b/internal/gen/strava-api-go/models/waypoint.go index 30375e5..cc96eba 100644 --- a/internal/gen/strava-api-go/models/waypoint.go +++ b/internal/gen/strava-api-go/models/waypoint.go @@ -7,6 +7,7 @@ package models import ( "context" + stderrors "errors" "github.com/go-openapi/errors" "github.com/go-openapi/strfmt" @@ -18,7 +19,6 @@ import ( // // swagger:model waypoint type Waypoint struct { - // Categories that the waypoint belongs to // Min Items: 0 Categories []string `json:"categories"` @@ -81,11 +81,15 @@ func (m *Waypoint) validateLatlng(formats strfmt.Registry) error { } if err := m.Latlng.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("latlng") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("latlng") } + return err } @@ -98,11 +102,15 @@ func (m *Waypoint) validateTargetLatlng(formats strfmt.Registry) error { } if err := m.TargetLatlng.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("target_latlng") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("target_latlng") } + return err } @@ -128,13 +136,16 @@ func (m *Waypoint) ContextValidate(ctx context.Context, formats strfmt.Registry) } func (m *Waypoint) contextValidateLatlng(ctx context.Context, formats strfmt.Registry) error { - if err := m.Latlng.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("latlng") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("latlng") } + return err } @@ -142,13 +153,16 @@ func (m *Waypoint) contextValidateLatlng(ctx context.Context, formats strfmt.Reg } func (m *Waypoint) contextValidateTargetLatlng(ctx context.Context, formats strfmt.Registry) error { - if err := m.TargetLatlng.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("target_latlng") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("target_latlng") } + return err } diff --git a/internal/gen/strava-api-go/models/zone_range.go b/internal/gen/strava-api-go/models/zone_range.go index defe073..c7c5f83 100644 --- a/internal/gen/strava-api-go/models/zone_range.go +++ b/internal/gen/strava-api-go/models/zone_range.go @@ -16,7 +16,6 @@ import ( // // swagger:model zoneRange type ZoneRange struct { - // The maximum value in the range. Max int64 `json:"max,omitempty"` diff --git a/internal/gen/strava-api-go/models/zone_ranges.go b/internal/gen/strava-api-go/models/zone_ranges.go index 67d8366..fa09084 100644 --- a/internal/gen/strava-api-go/models/zone_ranges.go +++ b/internal/gen/strava-api-go/models/zone_ranges.go @@ -7,6 +7,7 @@ package models import ( "context" + stderrors "errors" "strconv" "github.com/go-openapi/errors" @@ -30,11 +31,15 @@ func (m ZoneRanges) Validate(formats strfmt.Registry) error { if m[i] != nil { if err := m[i].Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName(strconv.Itoa(i)) - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName(strconv.Itoa(i)) } + return err } } @@ -52,7 +57,6 @@ func (m ZoneRanges) ContextValidate(ctx context.Context, formats strfmt.Registry var res []error for i := 0; i < len(m); i++ { - if m[i] != nil { if swag.IsZero(m[i]) { // not required @@ -60,15 +64,18 @@ func (m ZoneRanges) ContextValidate(ctx context.Context, formats strfmt.Registry } if err := m[i].ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName(strconv.Itoa(i)) - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName(strconv.Itoa(i)) } + return err } } - } if len(res) > 0 { diff --git a/internal/gen/strava-api-go/models/zones.go b/internal/gen/strava-api-go/models/zones.go index d63c0eb..593e16f 100644 --- a/internal/gen/strava-api-go/models/zones.go +++ b/internal/gen/strava-api-go/models/zones.go @@ -7,6 +7,7 @@ package models import ( "context" + stderrors "errors" "github.com/go-openapi/errors" "github.com/go-openapi/strfmt" @@ -17,7 +18,6 @@ import ( // // swagger:model zones type Zones struct { - // heart rate HeartRate *HeartRateZoneRanges `json:"heart_rate,omitempty"` @@ -50,11 +50,15 @@ func (m *Zones) validateHeartRate(formats strfmt.Registry) error { if m.HeartRate != nil { if err := m.HeartRate.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("heart_rate") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("heart_rate") } + return err } } @@ -69,11 +73,15 @@ func (m *Zones) validatePower(formats strfmt.Registry) error { if m.Power != nil { if err := m.Power.Validate(formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("power") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("power") } + return err } } @@ -100,7 +108,6 @@ func (m *Zones) ContextValidate(ctx context.Context, formats strfmt.Registry) er } func (m *Zones) contextValidateHeartRate(ctx context.Context, formats strfmt.Registry) error { - if m.HeartRate != nil { if swag.IsZero(m.HeartRate) { // not required @@ -108,11 +115,15 @@ func (m *Zones) contextValidateHeartRate(ctx context.Context, formats strfmt.Reg } if err := m.HeartRate.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("heart_rate") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("heart_rate") } + return err } } @@ -121,7 +132,6 @@ func (m *Zones) contextValidateHeartRate(ctx context.Context, formats strfmt.Reg } func (m *Zones) contextValidatePower(ctx context.Context, formats strfmt.Registry) error { - if m.Power != nil { if swag.IsZero(m.Power) { // not required @@ -129,11 +139,15 @@ func (m *Zones) contextValidatePower(ctx context.Context, formats strfmt.Registr } if err := m.Power.ContextValidate(ctx, formats); err != nil { - if ve, ok := err.(*errors.Validation); ok { + ve := new(errors.Validation) + if stderrors.As(err, &ve) { return ve.ValidateName("power") - } else if ce, ok := err.(*errors.CompositeError); ok { + } + ce := new(errors.CompositeError) + if stderrors.As(err, &ce) { return ce.ValidateName("power") } + return err } }